aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2019-06-20 11:18:14 -0700
committerPaul Eggert2019-06-20 11:19:09 -0700
commit8bccbb9889abfb5d9ca2127df6c788d9b992af37 (patch)
tree6c14a7bcb9a991546a9b74dccef5072b47ddeeaa
parente4e171bcac366f4d8538082230c804ae12cb2059 (diff)
downloademacs-8bccbb9889abfb5d9ca2127df6c788d9b992af37.tar.gz
emacs-8bccbb9889abfb5d9ca2127df6c788d9b992af37.zip
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.
-rw-r--r--Makefile.in1
-rw-r--r--lib/Makefile.in1
2 files changed, 2 insertions, 0 deletions
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)
942 -rm -f config-tmp-* aclocal.m4 configure 942 -rm -f config-tmp-* aclocal.m4 configure
943 -rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi 943 -rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi
944 -rm -f info/*.info info/dir 944 -rm -f info/*.info info/dir
945 -rmdir info 2>/dev/null
945 946
946# The src subdir knows how to do the right thing 947# The src subdir knows how to do the right thing
947# even when the build directory and source dir are different. 948# 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
127maintainer-clean: distclean 127maintainer-clean: distclean
128 rm -f TAGS gnulib.mk 128 rm -f TAGS gnulib.mk
129extraclean: distclean 129extraclean: distclean
130 -rmdir sys 2>/dev/null
130 131
131.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean 132.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
132 133