Revised some targets to make better use of make "special" variables, to avoid

repeating file names.

Change lib.texi target to not overwrite the input file; work on a copy.

diff --git a/Doc/Makefile b/Doc/Makefile
index 7501ace0dc456069065454cb126ee7ba37fd91c9..4281d40bc99cc5d3d1b52f02b4081c5cb181bb4b 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -73,6 +73,7 @@ PARTPARSE=    $(PYTHON) $(PARTPARSEOBJ)
 VERSION=1.5
 
 DVIFILES=      api.dvi ext.dvi lib.dvi tut.dvi
+INFOFILES=     python-lib.info
 PDFFILES=      api.pdf ext.pdf lib.pdf tut.pdf
 PSFILES=       api.ps ext.ps lib.ps tut.ps
 
@@ -213,17 +214,18 @@ api.dvi: api.tex
 # the info file gets generated.
 
 lib1.texi: lib*.tex texipre.dat texipost.dat $(PARTPARSEOBJ)
-       $(PARTPARSE) -o lib1.texi `./whichlibs`
-       sed 's/"{\\}n{\\}n/"\\n\\n/' lib1.texi >lib2.texi
-       mv lib2.texi lib1.texi
+       $(PARTPARSE) -o $@ `./whichlibs`
+       sed 's/"{\\}n{\\}n/"\\n\\n/' $@ >temp.texi
+       mv temp.texi $@
 
 lib.texi: lib1.texi fix.el
+       cp lib1.texi temp.texi
        $(EMACS) -batch -l fix.el -f save-buffer -kill
-       cp lib1.texi lib.texi
+       mv temp.texi $@
 
 python-lib.info: lib.texi
        -$(MAKEINFO) --footnote-style end --fill-column 72 \
-                    --paragraph-indent 0 lib.texi
+                    --paragraph-indent 0 $<
 
 # this is needed to prevent a second set of info files from being generated,
 # at least when using GNU make
@@ -280,12 +282,15 @@ l2hapi: api.dvi myformat.perl
        mv api/xxx api/api.html
        ln -s api.html api/index.html || true
 
+info-$(VERSION).tar.gz: $(INFOFILES)
+       tar cf - python-???.info* | gzip -9 >$@
+
 pdf-$(VERSION).tar.gz: $(PDFFILES)
-       tar cf - ???.pdf | gzip -9 >pdf-$(VERSION).tar.gz
+       tar cf - ???.pdf | gzip -9 >$@
 
 postscript-$(VERSION).tar.gz: $(PSFILES) ref/ref.ps
        cp ref/ref.ps .
-       tar cf - ???.ps | gzip -9 >postscript-$(VERSION).tar.gz
+       tar cf - ???.ps | gzip -9 >$@
        rm ref.ps
 
 tarhtml:
@@ -293,6 +298,10 @@ tarhtml:
        tar cf - index.html ???/???.css ???/*.html lib/*.gif icons/*.* \
                | gzip -9 >html-$(VERSION).tar.gz
 
+# convenience targets:
+
+tarinfo:  info-$(VERSION).tar.gz
+
 tarps: postscript-$(VERSION).tar.gz
 
 tarpdf:        pdf-$(VERSION).tar.gz