[Emacs-diffs] Changes to emacs/Makefile.in,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/05/09 04:28:15

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -b -r1.346 -r1.347
--- Makefile.in 7 May 2008 07:35:40 -0000       1.346
+++ Makefile.in 9 May 2008 04:28:15 -0000       1.347
@@ -554,7 +554,7 @@
           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 @@
        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 @@
 # 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