From eb36672f2bc4cb3eeed3bd802c340ccb8416ad26 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 16 Apr 2014 18:35:20 -0700 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/Makefile.in | 5 ++++- doc/lispintro/ChangeLog | 4 ++++ doc/lispintro/Makefile.in | 4 +++- doc/lispref/ChangeLog | 4 ++++ doc/lispref/Makefile.in | 5 ++++- doc/misc/ChangeLog | 4 ++++ doc/misc/Makefile.in | 7 +++++-- 8 files changed, 34 insertions(+), 5 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d4514904c77..fb17acc415a 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2014-04-17 Paul Eggert + + * 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 * display.texi (Cursor Display): Explain better how to customize diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 4a59ebed521..9006ba1fbed 100644 --- 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 6ca9eb4c93f..a5878fc7568 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2014-04-17 Paul Eggert + + * Makefile.in (infoclean): Be consistent about reporting failures. + 2014-02-25 Glenn Morris * 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 c041cd17e02..c1c6ef71fa2 100644 --- 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 25fa8ca4946..8adbabc36bb 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-04-17 Paul Eggert + + * Makefile.in (infoclean): Be consistent about reporting failures. + 2014-04-09 Daniel Colascione * errors.texi (Standard Errors): Document required error diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index bb8d4f82884..e7bfedfa583 100644 --- 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 d51db539f87..4ad0293ee9b 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-04-17 Paul Eggert + + * Makefile.in (infoclean): Be consistent about reporting failures. + 2014-03-27 Glenn Morris * Makefile.in (INFO_COMMON): Add vhdl-mode. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 09687aaa1ee..f74d7eaa2d1 100644 --- 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 -- 2.39.2