merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Dec 2006 14:40:55 +0100
changeset 3909 dd86f99e3c02
parent 3906 1063a631cb8e (current diff)
parent 3908 8020c35b6455 (diff)
child 3919 b12eae71382d
child 3920 f2c4a2ee59ed
merge with crew-stable
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -14,7 +14,7 @@ html: $(HTML)
 hg.1.txt: hg.1.gendoc.txt
 	touch hg.1.txt
 
-hg.1.gendoc.txt: ../mercurial/commands.py
+hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py
 	python gendoc.py > $@
 
 %: %.xml
@@ -29,7 +29,7 @@ hg.1.gendoc.txt: ../mercurial/commands.p
 MANIFEST: man html
 	# versionned files are already in the main MANIFEST
 	$(RM) $@
-	for i in $(MAN) $(HTML); do \
+	for i in $(MAN) $(HTML) hg.1.gendoc.txt; do \
 	  echo "doc/$$i" >> $@ ; \
 	done