Skip to content

Commit d9dd6db

Browse files
committed
issue2550774: Fix generating the website documentation
- the COPYING.txt file needs to be symlinked into website/www/ so the documentation can be generated correctly - add website/www/COPYING.txt to the .hgignore file so the symlinked version does not get accidentally committed to the repository - the website documentation Makefile 'clean' removes the symlinks and the generated html to return things back to the original state, which is what should happen on a 'clean'
1 parent 1b46e7d commit d9dd6db

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ locale/*.mo
4242
locale/*.bak
4343
locale/*.poedit
4444
website/www/_tmp/
45+
website/www/COPYING.txt
4546
website/www/docs
4647
website/www/html/

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ Fixed:
7474
(John Kristensen)
7575
- issue2550774: Include doc/conf.py in the release tarball, so people can build
7676
their own documentation in html, thanks Kai Storbeck (John Kristensen)
77+
- issue2550774: Update website/www/Makefile to symlink COPYING.txt so "make"
78+
works again, thanks Kai Storbeck (John Kristensen)
7779

7880
2012-05-15: 1.4.20
7981

website/www/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ help:
99
@echo " linkcheck to check all external links for integrity"
1010

1111
clean:
12-
-rm -rf $(TMP)
12+
-rm -rf $(TMP) $(HTML) docs COPYING.txt
1313

1414
docs:
1515
ln -s ../../doc ./docs
16+
ln -s ../../COPYING.txt
1617

1718
html: docs
1819
mkdir -p $(TMP)/doctrees $(HTML)

0 commit comments

Comments
 (0)