* Makefile.am (MAKEINFO): Removed.

(INSTALL.txt): Call $(MAKEINFO) with --no-split.
Reported by Nicolas Joly.

diff --git a/ChangeLog b/ChangeLog
index 3163fdd4c11e876d3335872d0f28f97e12a3e193..0a134f621687a442ab1de4b9fda5bef952b8047f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-29  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.am (MAKEINFO): Removed.
+       (INSTALL.txt): Call $(MAKEINFO) with --no-split.
+       Reported by Nicolas Joly.
+
 2000-02-28  Akim Demaille  <akim@epita.fr>
 
        * doc/Makefile.am (MAKEINFO): s/makeinfo/@MAKEINFO@/.

diff --git a/Makefile.am b/Makefile.am
index e9963368f598bbf0935bf262ee26007f9eea9ebc..f363a48b125efed0c81af6662329e38ba1d016ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,10 +58,8 @@ CLEANFILES = autoconf.m4f autoheader.m4f autoupdate.m4f \
 # for both targets and variables.  If we just use INSTALL, then the var
 # $(INSTALL) is not defined, and the install target fails.
 
-MAKEINFO = makeinfo --no-split
-
 INSTALL.txt: $(top_srcdir)/doc/install.texi
-       $(MAKEINFO) $< --no-headers --no-validate --output=$@
+       $(MAKEINFO) $< --no-headers --no-validate --no-split --output=$@
 
 install-data-hook: INSTALL.txt
        @$(NORMAL_INSTALL)

diff --git a/Makefile.in b/Makefile.in
index 02ff625be506a222f72f54352b413314c150cf93..c21d1c93eda3e9269f8a6cbba262453abd1492fa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,12 +95,6 @@ EXTRA_DIST = $(OLDCHANGELOGS) autoconf.sh autoheader.sh autoreconf.sh autoupdate
 CLEANFILES = autoconf.m4f autoheader.m4f autoupdate.m4f              $(bin_SCRIPTS)
 
 
-# INSTALL is a special case.  Automake seems to have a single name space
-# for both targets and variables.  If we just use INSTALL, then the var
-# $(INSTALL) is not defined, and the install target fails.
-
-MAKEINFO = makeinfo --no-split
-
 # The scripts.
 
 editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e   's,@''M4''@,$(M4),g'  -e 's,@''AWK''@,$(AWK),g'         -e 's,@''SHELL''@,$(SHELL),g'   -e 's,@''VERSION''@,$(VERSION),g' -e 's,@''PACKAGE''@,$(PACKAGE),g'
@@ -417,8 +411,12 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+# INSTALL is a special case.  Automake seems to have a single name space
+# for both targets and variables.  If we just use INSTALL, then the var
+# $(INSTALL) is not defined, and the install target fails.
+
 INSTALL.txt: $(top_srcdir)/doc/install.texi
-       $(MAKEINFO) $< --no-headers --no-validate --output=$@
+       $(MAKEINFO) $< --no-headers --no-validate --no-split --output=$@
 
 install-data-hook: INSTALL.txt
        @$(NORMAL_INSTALL)