fix MANIFEST generation

Makefile

@@ -53,12 +53,18 b' install-home-bin: build'
 install-home-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install
 
+MANIFEST-doc:
+	$(MAKE) -C doc MANIFEST
+
+MANIFEST: MANIFEST-doc
+	hg manifest > MANIFEST
+	echo mercurial/__version__.py >> MANIFEST
+	cat doc/MANIFEST >> MANIFEST
+
 dist:	tests dist-notests
 
-dist-notests:	doc
-	hg manifest > MANIFEST
+dist-notests:	doc MANIFEST
 	TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist
-	rm MANIFEST
 
 tests:
 	cd tests && $(PYTHON) run-tests.py

doc/Makefile

@@ -26,6 +26,13 b' hg.1.gendoc.txt: ../mercurial/commands.p'
 %.html: %.txt
 	asciidoc -b html4 $*.txt || asciidoc -b html $*.txt
 
+MANIFEST: man html
+	# versionned files are already in the main MANIFEST
+	$(RM) $@
+	for i in $(MAN) $(HTML); do \
+	  echo "doc/$$i" >> $@ ; \
+	done
+
 install: man
 	for i in $(MAN) ; do \
 	  subdir=`echo $$i | sed -n 's/..*\.\([0-9]\)$$/man\1/p'` ; \
@@ -34,4 +41,4 b' install: man'
 	done
 
 clean:
-	$(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html) *.[0-9].gendoc.txt
+	$(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST