Be consistent about reporting infoclean failures.

* doc/emacs/Makefile.in (infoclean):
* doc/lispintro/Makefile.in (infoclean):
* doc/lispref/Makefile.in (infoclean):
* doc/misc/Makefile.in (infoclean):
Do not fail merely because the info directory does not exist,
but do fail if it exists and can't be cleaned.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d4514904c7709ab8fcee9a67344a990328a2ad45..fb17acc415ab11a3c5e6277b0994bb2a50112210 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+       Do not fail merely because the info directory does not exist,
+       but do fail if it exists and can't be cleaned.
+
 2014-04-16  Eli Zaretskii  <eliz@gnu.org>
 
        * display.texi (Cursor Display): Explain better how to customize

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 4a59ebed52181df27abffcf1d3754f88d49a8571..9006ba1fbed5255b287803511712800031be3cf4 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -199,7 +199,10 @@ distclean: clean
 
 ## In the standalone tarfile, the clean rule runs this.
 infoclean:
-       -cd $(buildinfodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9]
+       rm -f \
+         $(buildinfodir)/emacs$(INFO_EXT) \
+         $(buildinfodir)/emacs$(INFO_EXT)-[1-9] \
+         $(buildinfodir)/emacs$(INFO_EXT)-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 6ca9eb4c93f147b6d8852914b4b490402823bd9d..a5878fc7568c16b270e27c1b23f1aeb3ad9eb8e0 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+
 2014-02-25  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp-intro.texi (X11 Colors): Don't use setq with hooks.

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index c041cd17e029fa76e86f106daf43cf6388ae933b..c1c6ef71fa2021129c10b06db8474e42af757727 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -116,7 +116,9 @@ distclean: clean
        rm -f Makefile
 
 infoclean:
-       -cd $(buildinfodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9]
+       rm -f \
+         $(buildinfodir)/eintr$(INFO_EXT) \
+         $(buildinfodir)/eintr$(INFO_EXT)-[1-9]
 
 maintainer-clean: distclean infoclean
 

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 25fa8ca4946954cc6a386996f7ff001ae793ab2b..8adbabc36bb243d6ea0ad46b16904d3e8103eed9 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+
 2014-04-09  Daniel Colascione  <dancol@dancol.org>
 
        * errors.texi (Standard Errors): Document required error

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index bb8d4f82884aa35fd6cf3ec507b5a0dcc25622de..e7bfedfa583d19c253d7112ad0ea349a806c9ec6 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -171,7 +171,10 @@ distclean: clean
        rm -f Makefile
 
 infoclean:
-       -cd $(buildinfodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9]
+       rm -f \
+         $(buildinfodir)/elisp$(INFO_EXT) \
+         $(buildinfodir)/elisp$(INFO_EXT)-[1-9] \
+         $(buildinfodir)/elisp$(INFO_EXT)-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d51db539f876bbf547e1de63ca6542103505a426..4ad0293ee9bf62aad0a4122ea74189543378b74f 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+
 2014-03-27  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (INFO_COMMON): Add vhdl-mode.

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 09687aaa1eedd6749870d504affaea0ee2264c75..f74d7eaa2d1994cf59a1b89bc6cef61849b468d4 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -882,9 +882,12 @@ distclean: clean
 
 ## buildinfodir is relative to srcdir.
 infoclean:
-       cd $(buildinfodir); for file in $(INFO_TARGETS); do \
+       for file in $(INFO_TARGETS); do \
          file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \
-         rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \
+         rm -f \
+           $(buildinfodir)/$${file} \
+           $(buildinfodir)/$${file}-[1-9] \
+           $(buildinfodir)/$${file}-[1-9][0-9]; \
        done
 
 maintainer-clean: distclean infoclean