summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
-rw-r--r--doc/ChangeLog6
-rw-r--r--doc/Makefile.am6
4 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index be1d0b9..548e996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-19 Bruno Haible <haible@clisp.cons.org>
+
+ * configure.in: Remove check for texi2html.
+
2001-10-09 Bruno Haible <haible@clisp.cons.org>
* configure.in: Also check for putc_unlocked.
diff --git a/configure.in b/configure.in
index d6740bc..c3499e3 100644
--- a/configure.in
+++ b/configure.in
@@ -104,12 +104,11 @@ dnl Check for tools needed for formatting the documentation.
ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
AC_PATH_PROG(DVIPS, dvips, $ac_aux_dir_abs/missing dvips)
AC_PATH_PROG(TEXI2PDF, texi2pdf, $ac_aux_dir_abs/missing texi2pdf)
-AC_PATH_PROG(TEXI2HTML, texi2html, $ac_aux_dir_abs/missing texi2html)
+AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
dnl Check for tools needed for formatting man pages.
CROSS_COMPILING=$cross_compiling
AC_SUBST(CROSS_COMPILING)
-AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
dnl Generate the version information file in the intl/ directory.
test -d intl || mkdir intl
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 03489f6..5e253f5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-19 Bruno Haible <haible@clisp.cons.org>
+
+ * texi2html: New file, from texi2html-1.52 with modifications.
+ * Makefile.am (TEXI2HTML): Use @PERL@, not @TEXI2HTML@.
+ (gettext_toc.html): Update accordingly.
+
2001-10-11 Bruno Haible <haible@clisp.cons.org>
* msgattrib.texi: New file.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ce84685..77b55e8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -129,7 +129,7 @@ uninstall-pdf:
# Documentation in HTML format.
-TEXI2HTML = @TEXI2HTML@
+TEXI2HTML = @PERL@ $(srcdir)/texi2html
html-monolithic: gettext.html
html-split: gettext_toc.html
@@ -138,8 +138,8 @@ gettext.html: gettext.texi version.texi $(gettext_TEXINFOS)
$(TEXI2HTML) -expandinfo -number -monolithic `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi`
gettext_toc.html: gettext.texi version.texi $(gettext_TEXINFOS)
- case "$(TEXI2HTML)" in \
- *"/missing texi2html") \
+ case "@PERL@" in \
+ *"/missing perl") \
$(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` || exit 0 ;; \
*) $(RM) gettext_*.html ; \
$(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` ;; \