Add support for bzip2 compression.

New target: distfiles, create all distribution archives, regardless of
archive format.  (Individual targets remain for each archive format.)

diff --git a/Doc/Makefile b/Doc/Makefile
index 77eea69fa38387f3458521a8ccbf8675ba54fe3a..70a373adf98dbaa11ef2023fb2af5d847530f835 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -208,22 +208,36 @@ info-$(RELEASE).tgz: info
        (cd $(INFODIR); tar cf - README python.dir python-???.info*) \
                | gzip -9 >$@
 
+info-$(RELEASE).tar.bz2: info
+       (cd $(INFODIR); tar cf - README python.dir python-???.info*) \
+               | bzip2 -9 >$@
+
 latex-$(RELEASE).tgz:
        $(TOOLSDIR)/mktarball.sh $(RELEASE)
 
+latex-$(RELEASE).tar.bz2:
+       $(TOOLSDIR)/mktarball.sh --bzip2 $(RELEASE)
+
 latex-$(RELEASE).zip:
        $(TOOLSDIR)/mktarball.sh --zip $(RELEASE)
 
 pdf-$(PAPER)-$(RELEASE).tgz: pdf
        (cd paper-$(PAPER); tar cf - *.pdf) | gzip -9 >$@
 
+pdf-$(PAPER)-$(RELEASE).tar.bz2: pdf
+       (cd paper-$(PAPER); tar cf - *.pdf) | bzip2 -9 >$@
+
 pdf-$(PAPER)-$(RELEASE).zip: pdf
        (cd paper-$(PAPER); zip -9 ../$@ *.pdf)
 
-postscript-$(PAPER)-$(RELEASE).tgz: ps
+postscript-$(PAPER)-$(RELEASE).tar.bz2: ps
        (cd paper-$(PAPER); $(MAKE) README)
        (cd paper-$(PAPER); tar cf - *.ps README) | gzip -9 >$@
 
+postscript-$(PAPER)-$(RELEASE).tgz: ps
+       (cd paper-$(PAPER); $(MAKE) README)
+       (cd paper-$(PAPER); tar cf - *.ps README) | bzip2 -9 >$@
+
 postscript-$(PAPER)-$(RELEASE).zip: ps
        (cd paper-$(PAPER); $(MAKE) README)
        (cd paper-$(PAPER); zip -9 ../$@ *.ps README)
@@ -232,6 +246,10 @@ html-$(RELEASE).tgz:       html
        (cd $(HTMLDIR); tar cf - *index.html ???/*.css ???/*.html */*.gif) \
                | gzip -9 >$@
 
+html-$(RELEASE).tar.bz2:       html
+       (cd $(HTMLDIR); tar cf - *index.html ???/*.css ???/*.html */*.gif) \
+               | bzip2 -9 >$@
+
 html-$(RELEASE).zip:   html
        (cd $(HTMLDIR); zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif)
 
@@ -243,7 +261,7 @@ tarps:              postscript-$(PAPER)-$(RELEASE).tgz
 tarpdf:                pdf-$(PAPER)-$(RELEASE).tgz
 tarlatex:      latex-$(RELEASE).tgz
 
-tarballs:      tarpdf tarps tarhtml tarinfo tarlatex
+tarballs:      tarpdf tarps tarhtml tarlatex
 
 ziphtml:       html-$(RELEASE).zip
 zipps:         postscript-$(PAPER)-$(RELEASE).zip
@@ -252,6 +270,16 @@ ziplatex:  latex-$(RELEASE).zip
 
 zips:          zippdf zipps ziphtml ziplatex
 
+bziphtml:      html-$(RELEASE).tar.bz2
+bzipinfo:      info-$(RELEASE).tar.bz2
+bzipps:                postscript-$(PAPER)-$(RELEASE).tar.bz2
+bzippdf:       pdf-$(PAPER)-$(RELEASE).tar.bz2
+bziplatex:     latex-$(RELEASE).tar.bz2
+
+bzips:         bzippdf bzipps bziphtml bziplatex
+
+distfiles:     tarballs zips bzips
+
 
 # Housekeeping targets