From aa9db089bc489b8e16de8e8164803c8c69f82c7e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 9 Oct 2010 11:39:01 -0700 Subject: [PATCH] Quieten emacs-devel. * doc/misc/Makefile.in (maintainer-clean): Remove harmless, long-standing error. * doc/lispref/Makefile.in (infoclean): Remove harmless, long-standing error. * doc/lispintro/Makefile.in (infoclean): Remove harmless, long-standing error. * doc/emacs/Makefile.in (infoclean): Remove harmless, long-standing error. --- doc/emacs/ChangeLog | 2 ++ doc/emacs/Makefile.in | 2 +- doc/lispintro/ChangeLog | 2 ++ doc/lispintro/Makefile.in | 2 +- doc/lispref/ChangeLog | 2 ++ doc/lispref/Makefile.in | 2 +- doc/misc/ChangeLog | 2 ++ doc/misc/Makefile.in | 3 ++- 8 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 478a3de1d4..2082fda3a4 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (infoclean): Remove harmless, long-standing error. + * Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. ($(infodir)/emacs): Use $mkinfodir instead of infodir. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index dd3bad1b8b..c963f8dc4f 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -166,7 +166,7 @@ distclean: clean ## In the standalone tarfile, the clean rule runs this. infoclean: - -cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9] + -cd $(srcdir) && cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9] maintainer-clean: distclean infoclean diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 72e743e4eb..b8d8f1e29b 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (infoclean): Remove harmless, long-standing error. + * Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. ($(infodir)/eintr): Use $mkinfodir instead of infodir. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 40cb48110c..da7976d745 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -78,7 +78,7 @@ clean: mostlyclean distclean: clean infoclean: - -cd $(infodir) && rm -f eintr eintr-[1-9] + -cd $(srcdir) && cd $(infodir) && rm -f eintr eintr-[1-9] maintainer-clean: distclean infoclean diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 262c3bc482..187567c67a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (infoclean): Remove harmless, long-standing error. + * Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. ($(infodir)/elisp): Use $mkinfodir instead of infodir. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index e5786bfd5f..050187fbb8 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -130,7 +130,7 @@ clean: mostlyclean distclean: clean infoclean: - -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9] + -cd $(srcdir) && cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9] maintainer-clean: distclean infoclean diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e080d1fe26..3bb73365af 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (maintainer-clean): Remove harmless, long-standing error. + * Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. Use it in all the info rules, rather than depending on infodir. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index fdb539db9f..97ffef69d0 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -675,8 +675,9 @@ clean: mostlyclean distclean: clean # rm -f Makefile +## infodir is relative to srcdir. maintainer-clean: distclean - for file in $(INFO_TARGETS); do \ + cd $(srcdir); for file in $(INFO_TARGETS); do \ rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \ done -- 2.20.1