Man Makefiles: dropping support for html, adding support for .so-ourced pages.

git-svn-id: svn://tug.org/texlive/trunk@12776 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 86 insertions, 21 deletions

diff --git a/Master/texmf/doc/man/Makefile b/Master/texmf/doc/man/Makefile
index e42c7afdc49..b2547f76873 100644
--- a/Master/texmf/doc/man/Makefile
+++ b/Master/texmf/doc/man/Makefile
@@ -2,15 +2,11 @@ DIR = man1 man5
 
 export GROFF = groff
 export PDFOPTS = -man -t -rS11
-export HTMLOPTS = -man -t -Thtml
 export PSPDF = ps2pdf -sPAPERSIZE=a4
 
 all: $(DIR)
 pdf: $(DIR)
-html: $(DIR)
 clean: $(DIR)
-	@echo 'Removing png files (from html).'
-	@rm -f -- *.png # html generates png's for tables etc
 
 # we don't cd to the new dir, since otherwise '.so man1/XXXX.1' doesn't work
 $(DIR): 
diff --git a/Master/texmf/doc/man/man1/Makefile b/Master/texmf/doc/man/man1/Makefile
index e4424668207..3f0779e513a 100644
--- a/Master/texmf/doc/man/man1/Makefile
+++ b/Master/texmf/doc/man/man1/Makefile
@@ -1,19 +1,92 @@
 SRC = $(wildcard man1/*.1)
 PDF = $(patsubst %.1, %.pdf, $(SRC))
-HTML = $(patsubst %.1, %.html, $(SRC))
+
+MKPDF  = $(GROFF) $(PDFOPTS)  $< | $(PSPDF) - $@
 
 all: pdf 
 pdf: $(PDF)
-html: $(HTML)
 
 clean:
-	@echo 'Removing pdf and html files.'
-	@rm -f -- $(PDF) $(HTML)
+	@echo 'Removing pdf files.'
+	@rm -f -- $(PDF)
+
+#%.pdf: %.1
+#	$(MKPDF)
+
+# The rules below are generated by the following script (from '../')
+# grep '^.so ' man1/* | \
+# sed -e 's/^\(.*\)\.1:\.so \(.*\)\.1$/\1.pdf: \2.1\n\t$(MKPDF)\n/'
+# and should be updated from time to time.
+
+man1/allec.pdf: man1/allcm.1
+	$(MKPDF)
+
+man1/ctangle.pdf: man1/cweb.1
+	$(MKPDF)
+
+man1/cweave.pdf: man1/cweb.1
+	$(MKPDF)
+
+man1/dvilj2p.pdf: man1/dvilj.1
+	$(MKPDF)
+
+man1/dvilj4.pdf: man1/dvilj.1
+	$(MKPDF)
+
+man1/dvilj4l.pdf: man1/dvilj.1
+	$(MKPDF)
+
+man1/dvilj6.pdf: man1/dvilj.1
+	$(MKPDF)
+
+man1/fmtutil-sys.pdf: man1/fmtutil.1
+	$(MKPDF)
+
+man1/getnonfreefonts-sys.pdf: man1/getnonfreefonts.1
+	$(MKPDF)
+
+man1/kpsepath.pdf: man1/kpsetool.1
+	$(MKPDF)
+
+man1/kpsexpand.pdf: man1/kpsetool.1
+	$(MKPDF)
+
+man1/lambda.pdf: man1/omega.1
+	$(MKPDF)
+
+man1/mf-nowin.pdf: man1/mf.1
+	$(MKPDF)
+
+man1/mktexfmt.pdf: man1/fmtutil.1
+	$(MKPDF)
+
+man1/odvicopy.pdf: man1/dvicopy.1
+	$(MKPDF)
+
+man1/odvips.pdf: man1/dvips.1
+	$(MKPDF)
+
+man1/odvitype.pdf: man1/dvitype.1
+	$(MKPDF)
+
+man1/oxdvi.pdf: man1/xdvi.1
+	$(MKPDF)
+
+man1/pdflatex.pdf: man1/pdftex.1
+	$(MKPDF)
+
+man1/texconfig-sys.pdf: man1/texconfig.1
+	$(MKPDF)
+
+man1/texhash.pdf: man1/mktexlsr.1
+	$(MKPDF)
 
-%.pdf: %.1
-	$(GROFF) $(PDFOPTS) $< | $(PSPDF) - $@
+man1/texlua.pdf: man1/luatex.1
+	$(MKPDF)
 
-%.html: %.1
-	$(GROFF) $(HTMLOPTS) $< > $@
+man1/texluac.pdf: man1/luatex.1
+	$(MKPDF)
 
+man1/updmap-sys.pdf: man1/updmap.1
+	$(MKPDF)
 
diff --git a/Master/texmf/doc/man/man5/Makefile b/Master/texmf/doc/man/man5/Makefile
index 1f32aa2db53..e4e847184d0 100644
--- a/Master/texmf/doc/man/man5/Makefile
+++ b/Master/texmf/doc/man/man5/Makefile
@@ -1,19 +1,15 @@
 SRC = $(wildcard man5/*.5)
 PDF = $(patsubst %.5, %.pdf, $(SRC))
-HTML = $(patsubst %.5, %.html, $(SRC))
+
+MKPDF  = $(GROFF) $(PDFOPTS)  $< | $(PSPDF) - $@
 
 all: pdf 
 pdf: $(PDF)
-html: $(HTML)
 
 clean:
-	@echo 'Removing pdf and html files.'
-	@rm -f -- $(PDF) $(HTML)
+	@echo 'Removing pdf files.'
+	@rm -f -- $(PDF)
 
 %.pdf: %.5
-	$(GROFF) $(PDFOPTS) $< | $(PSPDF) - $@
-
-%.html: %.5
-	$(GROFF) $(HTMLOPTS) $< > $@
-
+	$(MKPDF)