diff options
author | Ben Elliston <bje@gnu.org> | 2004-02-08 12:57:53 +0000 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2004-02-08 12:57:53 +0000 |
commit | 2d2bf0f0a77817d6d78e90952342668f09c668a8 (patch) | |
tree | bb84a2058c1bfb98288b613efab4b6262b5f87df /doc | |
parent | 7be5c4df755fb6b7c14432df5e3ff8bee16f2093 (diff) | |
download | dejagnu-2d2bf0f0a77817d6d78e90952342668f09c668a8.zip dejagnu-2d2bf0f0a77817d6d78e90952342668f09c668a8.tar.gz dejagnu-2d2bf0f0a77817d6d78e90952342668f09c668a8.tar.bz2 |
* configure.ac: Quote strings throughout in good Autoconf style.
Remove AC_PROG_YACC invocation. Search for docbook2dvi, et al and
expect using AC_PATH_PROG. Remove DJ_AC_PATH_DOCBOOK in favour of
existing macros. Remove stale BOARDS and CONFIG substs. Ensure Tcl
is at version 8.3 or greater.
* configure: Regenerate.
* acinclude.m4: Remove.
* aclocal.m4: Regenerate.
* Makefile.in: Likewise.
* doc/Makefile.am (%.pdf: %.sgml): Use $(DOCBOOK2PDF).
(%.dvi: %.sgml): Use $(DOCBOOK2DVI).
(%.html: %.sgml): Use $(DOCBOOK2HTML).
* doc/Makefile.in: Regenerate.
* example/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* testsuite/libdejagnu/Makefile.in: Likewise.
* TODO: Update.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 6 | ||||
-rw-r--r-- | doc/Makefile.in | 17 |
2 files changed, 11 insertions, 12 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 0333355..6199be0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -56,18 +56,18 @@ docs: $(TARGETS) %.pdf: %.sgml src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ - $(DOCBOOK)/db2pdf $${dir}/$*.sgml + $(DOCBOOK2PDF) $${dir}/$*.sgml %.dvi: %.sgml src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ - $(DOCBOOK)/db2dvi $${dir}/$*.sgml + $(DOCBOOK2DVI) $${dir}/$*.sgml %.html: %.sgml src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ mkdir html; \ - $(DOCBOOK)/db2html -o html $${dir}/$*.sgml + $(DOCBOOK2HTML) $${dir}/$*.sgml # Now for some extra dependencies that the automatic rules will not # catch: diff --git a/doc/Makefile.in b/doc/Makefile.in index 76e0260..1d72c63 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -37,8 +37,7 @@ subdir = doc DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -70,11 +69,9 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BOARDS = @BOARDS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CONFIG = @CONFIG@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ @@ -82,7 +79,9 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DOCBOOK = @DOCBOOK@ +DOCBOOK2DVI = @DOCBOOK2DVI@ +DOCBOOK2HTML = @DOCBOOK2HTML@ +DOCBOOK2PDF = @DOCBOOK2PDF@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -112,7 +111,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ @@ -146,6 +144,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ dist_man_MANS = runtest.1 info_TEXINFOS = dejagnu.texi +DOCBOOK = @DOCBOOK@ TARGETS = book1.html overview.ps overview.pdf EXTRA_DIST = overview.sgml user.sgml ref.sgml \ overview.pdf \ @@ -532,18 +531,18 @@ docs: $(TARGETS) %.pdf: %.sgml src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ - $(DOCBOOK)/db2pdf $${dir}/$*.sgml + $(DOCBOOK2PDF) $${dir}/$*.sgml %.dvi: %.sgml src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ - $(DOCBOOK)/db2dvi $${dir}/$*.sgml + $(DOCBOOK2DVI) $${dir}/$*.sgml %.html: %.sgml src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ mkdir html; \ - $(DOCBOOK)/db2html -o html $${dir}/$*.sgml + $(DOCBOOK2HTML) $${dir}/$*.sgml # Now for some extra dependencies that the automatic rules will not # catch: |