Look to the future: bump the version number.
Do more to ensure we don't do any more formatting than we need to.
Use separate targets for the distribution packages for paper-based and
non-paper-based formats; this avoids some extra packaging when a complete
distribution is being built with both paper sizes.
diff --git a/Doc/Makefile b/Doc/Makefile
index e8cfaa3..e38b892 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -67,7 +67,7 @@
# This is the *documentation* release, and is used to construct the file
# names of the downloadable tarballs.
-RELEASE=2.2a1
+RELEASE=2.2a2
PYTHON= python
DVIPS= dvips -N0 -t $(PAPER)
@@ -118,6 +118,8 @@
html/inst/inst.html \
html/dist/dist.html
+ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html
+
COMMONPERL= perl/manual.perl perl/python.perl perl/l2hinit.perl
include Makefile.deps
@@ -259,7 +261,7 @@
--output modindex.html --address $(PYTHONDOCS) \
lib/modindex.html mac/modindex.html
-html: $(INDEXFILES) html/index.html html/modindex.html html/acks.html
+html: $(ALLHTMLFILES)
api html/api/api.html: $(APIFILES)
$(MKHTML) --dir html/api api/api.tex
@@ -293,7 +295,7 @@
WEBCHECKER=$(PYTHON) ../Tools/webchecker/webchecker.py
HTMLBASE= file:`pwd`/html
-webcheck: html
+webcheck: $(ALLHTMLFILES)
$(WEBCHECKER) $(HTMLBASE)/api/
$(WEBCHECKER) $(HTMLBASE)/doc/
$(WEBCHECKER) $(HTMLBASE)/ext/
@@ -304,7 +306,7 @@
$(WEBCHECKER) $(HTMLBASE)/dist/
$(WEBCHECKER) $(HTMLBASE)/inst/
-fastwebcheck: html
+fastwebcheck: $(ALLHTMLFILES)
$(WEBCHECKER) -x $(HTMLBASE)/api/
$(WEBCHECKER) -x $(HTMLBASE)/doc/
$(WEBCHECKER) -x $(HTMLBASE)/ext/
@@ -318,7 +320,7 @@
# Release packaging targets:
-paper-$(PAPER)/README: ps $(TOOLSDIR)/getpagecounts
+paper-$(PAPER)/README: $(PSFILES) $(TOOLSDIR)/getpagecounts
cd paper-$(PAPER) && ../$(TOOLSDIR)/getpagecounts >../$@
info-$(RELEASE).tgz: info
@@ -339,23 +341,29 @@
rm -f $@
$(PYTHON) $(TOOLSDIR)/mksourcepkg --zip $(RELEASE)
-pdf-$(PAPER)-$(RELEASE).tgz: pdf
- cd paper-$(PAPER) && tar cf - *.pdf | gzip -9 >$@
+pdf-$(PAPER)-$(RELEASE).tar: $(PDFFILES)
+ cd paper-$(PAPER) && tar cf ../$@ *.pdf
-pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf
- cd paper-$(PAPER) && tar cf - *.pdf | bzip2 -9 >$@
+pdf-$(PAPER)-$(RELEASE).tgz: pdf-$(PAPER)-$(RELEASE).tar
+ gzip -9 <$? >$@
+
+pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf-$(PAPER)-$(RELEASE).tar
+ bzip2 -9 <$? >$@
pdf-$(PAPER)-$(RELEASE).zip: pdf
rm -f $@
cd paper-$(PAPER) && zip -q -9 ../$@ *.pdf
-postscript-$(PAPER)-$(RELEASE).tar.bz2: ps paper-$(PAPER)/README
- cd paper-$(PAPER) && tar cf - *.ps README | bzip2 -9 >$@
+postscript-$(PAPER)-$(RELEASE).tar: $(PSFILES) paper-$(PAPER)/README
+ cd paper-$(PAPER) && tar cf ../$@ *.ps README
-postscript-$(PAPER)-$(RELEASE).tgz: ps paper-$(PAPER)/README
- cd paper-$(PAPER) && tar cf - *.ps README | gzip -9 >$@
+postscript-$(PAPER)-$(RELEASE).tar.bz2: postscript-$(PAPER)-$(RELEASE).tar
+ bzip2 -9 <$< >$@
-postscript-$(PAPER)-$(RELEASE).zip: ps paper-$(PAPER)/README
+postscript-$(PAPER)-$(RELEASE).tgz: postscript-$(PAPER)-$(RELEASE).tar
+ gzip -9 <$< >$@
+
+postscript-$(PAPER)-$(RELEASE).zip: $(PSFILES) paper-$(PAPER)/README
rm -f $@
cd paper-$(PAPER) && zip -q -9 ../$@ *.ps README
@@ -365,12 +373,12 @@
*/*.gif */*.txt
html-$(RELEASE).tgz: html-$(RELEASE).tar
- gzip -9 <html-$(RELEASE).tar >$@
+ gzip -9 <$? >$@
html-$(RELEASE).tar.bz2: html-$(RELEASE).tar
- bzip2 -9 <html-$(RELEASE).tar >$@
+ bzip2 -9 <$? >$@
-html-$(RELEASE).zip: html
+html-$(RELEASE).zip: $(ALLHTMLFILES)
rm -f $@
cd $(HTMLDIR) && \
zip -q -9 ../$@ *.html */*.css */*.html */*.gif */*.txt
@@ -406,7 +414,10 @@
distpdf: tarpdf bzippdf zippdf
distlatex: tarlatex bziplatex ziplatex
-distfiles: tarballs zips bzips
+paperdist: distpdf distps
+edist: disthtml
+
+distfiles: paperdist edist
$(TOOLSDIR)/mksourcepkg --all $(RELEASE)