(install-arch-indep, info): Handle MAKEINFO == off.

diff --git a/ChangeLog b/ChangeLog
index 06120530bea38ece52f79730898f5bd951f67e13..bef6bc9d44ee85390eed8a05a6e74a54ee710594 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-09  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in: Make absence of makeinfo a fatal error only if the info
+       files don't exist.
+       * Makefile.in (install-arch-indep, info): Handle MAKEINFO == off.
+
 2008-05-07  Eli Zaretskii  <eliz@gnu.org>
 
        * config.bat: Fix last change: don't use < and > in "rem" lines,

diff --git a/Makefile.in b/Makefile.in
index f298a7dd2b81f5727084c875ac4d01e87219af17..1637f488a01599356c3f908ffdd8cfa6e51a5a62 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -554,7 +554,7 @@ install-arch-indep: mkdir info install-etc
           fi; \
           cd ${srcdir}/info ; \
           for elt in $(INFO_FILES); do \
-             test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
+             test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
              for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
                ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
                chmod a+r $(DESTDIR)${infodir}/$$f; \
@@ -566,7 +566,7 @@ install-arch-indep: mkdir info install-etc
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
        then \
          for elt in $(INFO_FILES); do \
-           test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
+           test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
            (cd $${thisdir}; \
             ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
          done; \
@@ -785,8 +785,11 @@ force-info:
 # put the info files in $(srcdir),
 # so we can do ok running make in the build dir.
 info: force-info
-       @if test "$(MAKEINFO)" = "no"; then \
-         echo "Configured without makeinfo, not building manuals" ; \
+       @if test "$(MAKEINFO)" = "off"; then \
+         echo "Configured --without-makeinfo, not building manuals" ; \
+       elif test "$(MAKEINFO)" = "no"; then \
+         echo "makeinfo is missing - cannot build manuals" ; \
+         exit 1 ; \
        else \
          $(MAKE) $(MFLAGS) info-real ; \
        fi