[Emacs-diffs] emacs ChangeLog Makefile.in

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/29 02:18:03

Modified files:
        .              : ChangeLog Makefile.in 

Log message:
        (info-real): Don't ignore errors from doc Makefiles.
        (info): Don't give an error in the absence of makeinfo - let the doc
        Makefiles do that, if the info files need rebuilding.  (Bug#3982)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.847&r2=1.848
http://cvs.savannah.gnu.org/viewcvs/emacs/Makefile.in?cvsroot=emacs&r1=1.376&r2=1.377

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -b -r1.847 -r1.848
--- ChangeLog   23 Aug 2009 03:54:33 -0000      1.847
+++ ChangeLog   29 Aug 2009 02:18:03 -0000      1.848
@@ -1,3 +1,9 @@
+2009-08-29  Glenn Morris  <address@hidden>
+
+       * Makefile.in (info-real): Don't ignore errors from doc Makefiles.
+       (info): Don't give an error in the absence of makeinfo - let the doc
+       Makefiles do that, if the info files need rebuilding.  (Bug#3982)
+
 2009-08-23  Ken Raeburn  <address@hidden>
 
        * Makefile.in (install-arch-indep): If the versioned DOC-####

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -b -r1.376 -r1.377
--- Makefile.in 23 Aug 2009 03:54:32 -0000      1.376
+++ Makefile.in 29 Aug 2009 02:18:03 -0000      1.377
@@ -807,21 +807,26 @@
 .PHONY: info dvi dist check html
 
 info-real: 
-       -(cd doc/emacs; $(MAKE) $(MFLAGS) info)
-       -(cd doc/misc; $(MAKE) $(MFLAGS) info)
-       -(cd doc/lispref; $(MAKE) $(MFLAGS) info)
-       -(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+       (cd doc/emacs; $(MAKE) $(MFLAGS) info)
+       (cd doc/misc; $(MAKE) $(MFLAGS) info)
+       (cd doc/lispref; $(MAKE) $(MFLAGS) info)
+       (cd doc/lispintro; $(MAKE) $(MFLAGS) info)
 
 force-info:
-# Note that man/Makefile knows how to
-# put the info files in $(srcdir),
+# Note that man/Makefile knows how to put the info files in $(srcdir),
 # so we can do ok running make in the build dir.
+# This used to have a clause that exited with an error if MAKEINFO = no.
+# But it is inappropriate to do so without checking if makeinfo is
+# actually needed - it is not if the info files are up-to-date.  (Bug#3982)
+# Only the doc/*/Makefiles can decide that, so we let those rules run
+# and give a standard error if makeinfo is needed but missing.
+# While it would be nice to give a more detailed error message, that
+# would require changing every rule in doc/ that builds an info file,
+# and it's not worth it. This case is only relevant if you download a
+# release, then change the .texi files.
 info: force-info
        @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