From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 20 Jun 2019 18:18:14 +0000 (-0700)
Subject: Fix extraclean in a different way for info+lib/sys
X-Git-Tag: emacs-27.0.90~2343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8bccbb9889abfb5d9ca2127df6c788d9b992af37;p=emacs.git

Fix extraclean in a different way for info+lib/sys

* Makefile.in (extraclean):
* lib/Makefile.in (extraclean): Use rmdir but suppress any
error indication.  That way, ‘make extraclean’ will remove the
directory if it’s empty, and successfully do nothing otherwise.
---

diff --git a/Makefile.in b/Makefile.in
index c829ca29bd5..aa11e6b0b74 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -942,6 +942,7 @@ extraclean: $(extraclean_dirs:=_extraclean)
 	-rm -f config-tmp-* aclocal.m4 configure
 	-rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi
 	-rm -f info/*.info info/dir
+	-rmdir info 2>/dev/null
 
 # The src subdir knows how to do the right thing
 # even when the build directory and source dir are different.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index bf9b01f1437..1973452b223 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -127,6 +127,7 @@ distclean bootstrap-clean: mostlyclean
 maintainer-clean: distclean
 	rm -f TAGS gnulib.mk
 extraclean: distclean
+	-rmdir sys 2>/dev/null
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean