[Emacs-diffs] trunk r116984: Be consistent about reporting infoclean failures.

[Paul Eggert]

------------------------------------------------------------
revno: 116984
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-04-16 18:35:20 -0700
message:
  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.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/Makefile.in          
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
  doc/lispintro/ChangeLog        changelog-20091113204419-o5vbwnq5f7feedwu-6128
  doc/lispintro/Makefile.in      
makefile.in-20091113204419-o5vbwnq5f7feedwu-6130
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/Makefile.in        
makefile.in-20091113204419-o5vbwnq5f7feedwu-6156
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/Makefile.in           
makefile.in-20091113204419-o5vbwnq5f7feedwu-6287

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-04-16 19:43:46 +0000
+++ b/doc/emacs/ChangeLog       2014-04-17 01:35:20 +0000
@@ -1,3 +1,9 @@
+2014-04-17  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * display.texi (Cursor Display): Explain better how to customize

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2014-01-01 07:43:34 +0000
+++ b/doc/emacs/Makefile.in     2014-04-17 01:35:20 +0000
@@ -199,7 +199,10 @@
 
 ## 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
 

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2014-02-25 03:11:11 +0000
+++ b/doc/lispintro/ChangeLog   2014-04-17 01:35:20 +0000
@@ -1,3 +1,7 @@
+2014-04-17  Paul Eggert  <address@hidden>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+
 2014-02-25  Glenn Morris  <address@hidden>
 
        * emacs-lisp-intro.texi (X11 Colors): Don't use setq with hooks.

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2014-01-01 07:43:34 +0000
+++ b/doc/lispintro/Makefile.in 2014-04-17 01:35:20 +0000
@@ -116,7 +116,9 @@
        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
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2014-04-09 16:58:08 +0000
+++ b/doc/lispref/ChangeLog     2014-04-17 01:35:20 +0000
@@ -1,3 +1,7 @@
+2014-04-17  Paul Eggert  <address@hidden>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+
 2014-04-09  Daniel Colascione  <address@hidden>
 
        * errors.texi (Standard Errors): Document required error

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2014-01-10 19:40:32 +0000
+++ b/doc/lispref/Makefile.in   2014-04-17 01:35:20 +0000
@@ -171,7 +171,10 @@
        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
 

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-03-27 18:22:27 +0000
+++ b/doc/misc/ChangeLog        2014-04-17 01:35:20 +0000
@@ -1,3 +1,7 @@
+2014-04-17  Paul Eggert  <address@hidden>
+
+       * Makefile.in (infoclean): Be consistent about reporting failures.
+
 2014-03-27  Glenn Morris  <address@hidden>
 
        * Makefile.in (INFO_COMMON): Add vhdl-mode.

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2014-03-27 18:22:27 +0000
+++ b/doc/misc/Makefile.in      2014-04-17 01:35:20 +0000
@@ -882,9 +882,12 @@
 
 ## 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