grahamc/hydra2 - Change 6U6KBFYPWI2WJPZFEK6W4RN5JSRKFCBEPMKHDYEPGOROC5EWI2EAC

Build the HTML manual; add the HTML & PDF to the distribution; install them.

doc/manual/Makefile.am (dist_html_DATA, dist_pdf_DATA): New variables. (manual.html): New target. (manual.pdf): Use $(DBLATEX), uppercase.
configure.ac: Check for xsltproc'. Add –with-docbook-xsl' option.

Created by Ludovic Courtès on July 4, 2011

6U6KBFYPWI2WJPZFEK6W4RN5JSRKFCBEPMKHDYEPGOROC5EWI2EAC

Dependencies

[2] FV2M6MOTAP4BJMEKU5XUDVEACWEJGEIRCCE2MRY3F6SF2SFOE3MQC

In channels

main

Change contents

Replacement in configure.ac at line 13 [2.15951]

B:BD[2.16097] → [2.16097:16128]

AC_PATH_PROG(dblatex, dblatex)

[2.16097]

[2.16128]

dnl Optional dependencies to build the manual, normally not needed
dnl since the tarball comes with the PDF and HTML manuals.
AC_PATH_PROG([DBLATEX], [dblatex])
AC_PATH_PROG([XSLTPROC], [xsltproc])
AC_ARG_WITH([docbook-xsl],
  [AS_HELP_STRING([--with-docbook-xsl=PATH],
    [path of the DocBook XSL stylesheets])],
  [docbookxsl="$withval"],
  [docbookxsl="/docbook-xsl-missing"])
AC_SUBST([docbookxsl])

Insertion in doc/manual/Makefile.am at line 10 [2.16946]

[2.17129]

# Include the manual in the tarball.
dist_html_DATA = manual.html
dist_pdf_DATA = manual.pdf
manual.html: $(DOCBOOK_FILES)
	if test "$(XSLTPROC)" != ""; then				\
		$(XSLTPROC) --nonet --xinclude --output manual.html	\
	 	   $(docbookxsl)/html/docbook.xsl manual.xml;		\
	else								\
		@echo "Please install xsltproc and rerun configure.";	\
		exit 1;							\
	fi

Replacement in doc/manual/Makefile.am at line 24 [2.16946]

B:BD[2.17159] → [2.17159:17245]

	if test "$(dblatex)" != ""; then \
	        $(dblatex) $(dblatex_opts) manual.xml; \

[2.17159]

[2.17245]

	if test "$(DBLATEX)" != ""; then \
	        $(DBLATEX) $(dblatex_opts) manual.xml; \