Merge alpha100 branch back to main trunk
diff --git a/Doc/Makefile b/Doc/Makefile
index d13f59f..fbf62f6 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -2,13 +2,14 @@
LIBDESTDIR=$DESTDIR/lib
LIBDEST=$LIBDESTDIR/python
DOCDESTDIR=$LIBDEST/doc
+DVIPS= dvips -f
-all: tut lib ref ext qua
+all: tut lib ref ext
tut:
latex tut
latex tut
- dvips tut >tut.ps
+ $(DVIPS) tut >tut.ps
ref:
touch ref.ind
@@ -16,7 +17,7 @@
./fix_hack ref.idx
makeindex ref
latex ref
- dvips ref >ref.ps
+ $(DVIPS) ref >ref.ps
lib:
touch lib.ind
@@ -24,7 +25,7 @@
./fix_hack lib.idx
makeindex lib
latex lib
- dvips lib >lib.ps
+ $(DVIPS) lib >lib.ps
ext:
touch ext.ind
@@ -32,32 +33,51 @@
./fix_hack ext.idx
makeindex ext
latex ext
- dvips ext >ext.ps
+ $(DVIPS) ext >ext.ps
qua:
latex qua
bibtex qua
latex qua
latex qua
- dvips qua >qua.ps
+ $(DVIPS) qua >qua.ps
-lib.texi: lib1.tex lib2.tex lib3.tex lib4.tex lib5.tex \
- texipre.dat texipost.dat partparse.py
- python partparse.py -o @lib.texi lib[1-5].tex
+lib.texi: lib*.tex texipre.dat texipost.dat partparse.py fix.el
+ python partparse.py -o @lib.texi `whichlibs`
+ emacs -batch -l fix.el -f save-buffer -kill
mv @lib.texi lib.texi
.PRECIOUS: lib.texi
-python-lib.info: lib.texi fix.el
- emacs -batch -l fix.el -f save-buffer -kill
- makeinfo +footnote-style end +fill-column 72 +paragraph-indent 0 \
+python-lib.info: lib.texi
+ makeinfo --footnote-style end --fill-column 72 --paragraph-indent 0 \
lib.texi
lib.info: python-lib.info
# This target is very local to CWI...
libwww: lib.texi
- texi2html -d lib.texi /usr/local/ftp.cwi.nl/pub/www/texinfo/python
+ texi2html -d lib.texi /ufs/guido/www/texinfo/python
+
+# This one too...
+L2H= /usr/local/LaTeX2html/latex2html
+L2HARGS=-address $$USER@`domainname` -dont_include myformat -nolatex
+l2h: l2htut l2href l2hext
+
+l2htut: tut
+ $(L2H) $(L2HARGS) tut.tex
+ @rm -rf python-tut
+ mv tut python-tut
+
+l2href: ref
+ $(L2H) $(L2HARGS) ref.tex
+ @rm -rf python-ref
+ mv ref python-ref
+
+l2hext: ext
+ $(L2H) $(L2HARGS) ext.tex
+ @rm -rf python-ext
+ mv ext python-ext
clean:
rm -f @* *~ *.aux *.idx *.ilg *.ind *.log *.toc *.blg *.bbl *.pyc