--- a/Makefile Mon Dec 11 16:40:42 2006 -0800
+++ b/Makefile Tue Dec 12 11:39:05 2006 +0100
@@ -53,12 +53,18 @@
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
--- a/doc/Makefile Mon Dec 11 16:40:42 2006 -0800
+++ b/doc/Makefile Tue Dec 12 11:39:05 2006 +0100
@@ -26,6 +26,13 @@
%.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 @@
done
clean:
- $(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html) *.[0-9].gendoc.txt
+ $(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST