Add support for the Macintosh Library Modules document.

diff --git a/Doc/Makefile b/Doc/Makefile
index 170507e216291502ee2cff3710a00856e07210e4..5d22a870901f93eaa76cc805b53307980b4a8ecd 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -75,15 +75,16 @@ VPATH=.
 RELEASE=1.5.1
 VERSION=1.5
 
-DVIFILES=      api.dvi ext.dvi lib.dvi ref.dvi tut.dvi
-PDFFILES=      api.pdf ext.pdf lib.pdf ref.pdf tut.pdf
-PSFILES=       api.ps ext.ps lib.ps ref.ps tut.ps
+DVIFILES=      api.dvi ext.dvi lib.dvi mac.dvi ref.dvi tut.dvi
+PDFFILES=      api.pdf ext.pdf lib.pdf mac.pdf ref.pdf tut.pdf
+PSFILES=       api.ps ext.ps lib.ps mac.ps ref.ps tut.ps
 
 # Be careful when messing with this one!
 TEXINPUTS=     .:../texinputs:
 
 MKDVI=         TEXINPUTS=$(TEXINPUTS) $(srcdir)/tools/mkdvi.sh
-MKHTML=                TEXINPUTS=$(TEXINPUTS) $(srcdir)/tools/mkhtml.sh
+MKHOWTO=       $(srcdir)/tools/mkhowto.sh --keep
+MKHTML=                PAPER=$(PAPER) $(srcdir)/tools/mkhtml.sh
 MKPDF=         TEXINPUTS=$(TEXINPUTS) $(srcdir)/tools/mkdvi.sh --pdf
 
 # Main target
@@ -140,7 +141,7 @@ tut:
 
 do-dvi: $(DVIFILES)
 do-pdf: $(PDFFILES)
-do-ps:  $(PSFILES)
+do-ps: $(PSFILES)
 
 # This target gets both the PDF and PS files updated.
 #
@@ -251,6 +252,13 @@ ext.dvi: ext/ext.tex
 ext.pdf: ext/ext.tex
        $(MKPDF) ext
 
+# Macintosh Library Modules
+mac.dvi: $(MACLIBFILES) tools/mkhowto.sh
+       $(MKHOWTO) --dvi $(srcdir)/$*/$*.tex
+
+mac.pdf: $(MACLIBFILES) tools/mkhowto.sh
+       $(MKHOWTO) --pdf $(srcdir)/$*/$*.tex
+
 # Python Reference Manual
 ref.dvi: $(REFFILES)
        $(MKDVI) ref
@@ -290,7 +298,7 @@ COMMONPERL=perl/manual.perl perl/python.perl
 html:  l2h
 
 l2h:
-       (cd $(HTMLDIR); $(MAKE) TEXINPUTS=../paper-$(PAPER):../texinputs)
+       (cd $(HTMLDIR); $(MAKE) TEXINPUTS=../paper-$(PAPER):../texinputs:)
 
 l2hapi: $(COMMONPERL)
        $(MKHTML) api $(L2HARGS)
@@ -298,11 +306,14 @@ l2hapi: $(COMMONPERL)
 l2hext: $(COMMONPERL)
        $(MKHTML) ext $(L2HARGS)
 
-l2hlib: $(COMMONPERL)
+l2hlib: $(COMMONPERL) $(LIBFILES)
        $(srcdir)/tools/fix_libaux.sed <`$(KPSEWHICH) lib.aux` >lib1.aux
        mv lib1.aux `$(KPSEWHICH) lib.aux`
        $(MKHTML) lib $(L2HARGS)
 
+l2hmac: $(COMMONPERL) $(MACLIBFILES)
+       $(srcdir)/tools/mkhowto.sh --html $(srcdir)/mac/mac.tex
+
 l2href: $(COMMONPERL)
        $(MKHTML) ref $(L2HARGS)
 

diff --git a/Doc/html/Makefile b/Doc/html/Makefile
index 3b0aa05e48526d5981a475871415cb236740232d..9418d4060ed966978963b1c794e9306f74fcc1e3 100644 (file)
--- a/Doc/html/Makefile
+++ b/Doc/html/Makefile
@@ -9,7 +9,7 @@ TEXINPUTS=..:../texinputs
 
 all:   icons l2h
 
-l2h:   l2hapi l2hext l2hlib l2href l2htut
+l2h:   l2hapi l2hext l2hlib l2hmac l2href l2htut
 
 l2hapi:
        $(MAKE) srcdir=.. VPATH=.. TEXINPUTS=$(TEXINPUTS) -f ../Makefile l2hapi
@@ -20,6 +20,9 @@ l2hext:
 l2hlib:
        $(MAKE) srcdir=.. VPATH=.. TEXINPUTS=$(TEXINPUTS) -f ../Makefile l2hlib
 
+l2hmac:
+       $(MAKE) srcdir=.. VPATH=.. TEXINPUTS=$(TEXINPUTS) -f ../Makefile l2hmac
+
 l2href:
        $(MAKE) srcdir=.. VPATH=.. TEXINPUTS=$(TEXINPUTS) -f ../Makefile l2href