[m-rev.] diff: build pdf docs for 0.11 release

[Ian MacLarty]

Do I apply this to the version-0_11-branch branch?

Estimated hours taken: 0.2
Branches 0.11

Build pdf files for 0.11 release docs so I don't have to complicate
w3/information/Mmakefile which installs the docs for the release and snapshot
on the web site.

Mmake.common.in:
configure.in:
        Set PDFTEX to the location of the pdftex program.

doc/Mmakefile:
        Make and install the pdf documentation.

scripts/Mmake.vars.in:
        Set the install directory for pdf version of the documentation.

Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.68.2.3
diff -u -r1.68.2.3 Mmake.common.in
--- Mmake.common.in	30 Dec 2003 08:25:09 -0000	1.68.2.3
+++ Mmake.common.in	19 Aug 2005 16:10:31 -0000
@@ -177,6 +177,7 @@
 INFO=@INFO@
 TEXI2DVI=@TEXI2DVI@
 DVIPS=@DVIPS@
+PDFTEX=@PDFTEX@
 MAKEINFO=@MAKEINFO@
 PERL=@PERL@

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.338.2.9
diff -u -r1.338.2.9 configure.in
--- configure.in	6 Jun 2003 10:26:23 -0000	1.338.2.9
+++ configure.in	19 Aug 2005 16:11:37 -0000
@@ -363,6 +363,9 @@
 AC_PATH_PROG(DVIPS,dvips)
 AC_SUBST(DVIPS)
 #-----------------------------------------------------------------------------#
+AC_PATH_PROG(PDFTEX, pdftex)
+AC_SUBST(PDFTEX)
+#-----------------------------------------------------------------------------#
 AC_PATH_PROG(MAKEINFO,makeinfo)
 AC_SUBST(MAKEINFO)
 #-----------------------------------------------------------------------------#
Index: doc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/Mmakefile,v
retrieving revision 1.31.2.1
diff -u -r1.31.2.1 Mmakefile
--- doc/Mmakefile	29 Nov 2002 07:06:19 -0000	1.31.2.1
+++ doc/Mmakefile	19 Aug 2005 16:16:50 -0000
@@ -34,6 +34,12 @@
 	endif
 endif

+ifeq ("$(PDFTEX)","")
+	PDF=warn_no_pdf
+else
+	PDF=pdf
+endif
+
 ifeq ("$(MAKEINFO)","")
 	INFOPAGES=warn_no_info
 	MDB_DOC=warn_no_mdb_doc
@@ -50,7 +56,7 @@

 #-----------------------------------------------------------------------------#

-.SUFFIXES: .in .texi_pp .texi .dvi .ps .text
+.SUFFIXES: .in .texi_pp .texi .dvi .ps .pdf .text

 %.dvi: %.texi_pp
 	$(TEXI2DVI) $< > $*.dvi_log
@@ -58,6 +64,9 @@
 %.ps: %.dvi
 	$(DVIPS) -f < $< > $@

+%.pdf: %.texi_pp
+	$(PDFTEX) $< > $*.pdf_log
+
 %.text: %.texi_pp
 	$(MAKEINFO) --no-headers -o $@ $<

@@ -86,11 +95,12 @@

 #-----------------------------------------------------------------------------#

-	# Currently `mmake all' does not build the PostScript or plain-text
-	# versions of the documentation.  But it might make sense to add them.
+	# Currently `mmake all' does not build the PostScript, PDF or
+	# plain-text versions of the documentation.  But it might make sense to
+	# add them.
 .PHONY: all
 all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC)
-#all: ps text
+#all: ps pdf text

 #-----------------------------------------------------------------------------#

@@ -129,6 +139,14 @@
 	# Warning: Unable to build .ps files.
 	# This is probably due to a missing `dvips' or `text2dvi'

+.PHONY: pdf
+pdf: user_guide.pdf reference_manual.pdf library.pdf faq.pdf transition_guide.pdf
+
+.PHONY: warn_no_pdf
+warn_no_pdf:
+	# Warning: Unable to build .pdf files.
+	# This is probably due to a missing `pdftex'.
+
 .PHONY: text
 text: user_guide.text reference_manual.text library.text faq.text \
 	transition_guide.text
@@ -264,6 +282,7 @@
 	-[ -d $(INSTALL_DVI_DIR) ] || mkdir -p $(INSTALL_DVI_DIR)
 	-[ -d $(INSTALL_TEXT_DIR) ] || mkdir -p $(INSTALL_TEXT_DIR)
 	-[ -d $(INSTALL_PS_DIR) ] || mkdir -p $(INSTALL_PS_DIR)
+	-[ -d $(INSTALL_PDF_DIR) ] || mkdir -p $(INSTALL_PDF_DIR)
 	-[ -d $(INSTALL_MAN_DIR)/man1 ] || \
 		mkdir -p $(INSTALL_MAN_DIR)/man1
 	-[ -d $(INSTALL_MDB_DOC_DIR) ] || mkdir -p $(INSTALL_MDB_DOC_DIR)
@@ -298,6 +317,10 @@
 install_ps: $(PS) install_dirs
 	-cp *.ps $(INSTALL_PS_DIR)

+.PHONY: install_pdf
+install_pdf: $(PDF) install_dirs
+	-cp *.pdf $(INSTALL_PDF_DIR)
+
 .PHONY: install_manpages
 install_manpages: manpages install_dirs
 	cp *.1 $(INSTALL_MAN_DIR)/man1
@@ -319,8 +342,9 @@
 # INSTALL_WEBPAGE_DIR).

 .PHONY: install_webpage
-install_webpage: library-chapters.texi_pp split_html ps install_dirs
+install_webpage: library-chapters.texi_pp split_html ps pdf install_dirs
 	cp *.ps $(INSTALL_WEBPAGE_DIR)
+	cp *.pdf $(INSTALL_WEBPAGE_DIR)
 	for file in $(INSTALL_WEBPAGE_DIR)/*.ps ; do \
 		gzip -f -9 $$file ; \
 	done
@@ -345,7 +369,7 @@
 	rm -f library*.html user_guide*.html reference_manual*.html
 	rm -f faq*.html transition_guide*.html
 	rm -f mercury.html mercury.info
-	rm -f mercury_*.info* *.dvi *.text *.ps
+	rm -f mercury_*.info* *.dvi *.text *.ps *.pdf

 .PHONY: realclean_manpages
 realclean_manpages:
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.83.2.1
diff -u -r1.83.2.1 Mmake.vars.in
--- scripts/Mmake.vars.in	19 May 2003 03:21:19 -0000	1.83.2.1
+++ scripts/Mmake.vars.in	19 Aug 2005 16:10:31 -0000
@@ -695,6 +695,7 @@
 INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
 INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
 INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
 INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
 INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
 INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------