From a75c73596d4917d29c0157ab82f765f0772e7dbe Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sat, 24 Dec 2005 10:08:33 +0000 Subject: * configure.ac (DOCBOOK2X_TEXI): Add search for this program. * configure: Regenerate. * Makefile.am (DOCBOOK2PDF, DOCBOOK2RTF, DOCBOOK2PS): New. (DOCBOOK2HTML, DOCBOOK2X_TEXI): Likewise. (dejagnu.pdf): Use $(DOCBOOK2PDF). (dejagnu.ps): Likewise, use $(DOCBOOK2PS). (dejagnu.rtf): Likewise, use $(DOCBOOK2RTF). (html): Likewise, use $(DOCBOOK2HTML). (doc/dejagnu.texi): Produce using the docbook2x-texi wrapper, which is much simpler. Likewise, use $(DOCBOOK2X_TEXI). * Makefile.in: Regenerate. --- Makefile.am | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d3faaef..1d91053 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,25 +199,28 @@ unit_SOURCES = testsuite/libdejagnu/unit.cc dist_man_MANS = doc/runtest.1 info_TEXINFOS = doc/dejagnu.texi +DOCBOOK2PDF = @DOCBOOK2PDF@ +DOCBOOK2RTF= = @DOCBOOK2RTF@ +DOCBOOK2PS = @DOCBOOK2PS@ +DOCBOOK2HTML = @DOCBOOK2HTML@ +DOCBOOK2X_TEXI = @DOCBOOK2X_TEXI@ + XML = doc/dejagnu.xml doc/legal.xml doc/ref.xml doc/user.xml dejagnu.pdf: $(XML) - docbook2pdf $(srcdir)/doc/dejagnu.xml + $(DOCBOOK2PDF) $(srcdir)/doc/dejagnu.xml dejagnu.ps: $(XML) - docbook2ps $(srcdir)/doc/dejagnu.xml + $(DOCBOOK2PS) $(srcdir)/doc/dejagnu.xml dejagnu.rtf: $(XML) - docbook2rtf $(srcdir)/doc/dejagnu.xml + $(DOCBOOK2RTF) $(srcdir)/doc/dejagnu.xml html: - docbook2html -o html $(srcdir)/doc/dejagnu.xml + $(DOCBOOK2HTML) -o html $(srcdir)/doc/dejagnu.xml doc/dejagnu.texi: $(XML) - db2x_xsltproc -s texi $(srcdir)/doc/dejagnu.xml -o dejagnu.txml - db2x_texixml dejagnu.txml - mv dejagnu.texi $(srcdir)/doc - rm dejagnu.txml + $(DOCBOOK2X_TEXI) $(srcdir)/doc/dejagnu.xml --to-stdout > $(srcdir)/$@ # Packaging. -- cgit v1.1