aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-08-20 01:30:24 -0700
committerPaul Eggert2013-08-20 01:30:24 -0700
commit236beba0c2cf9b757f7a25f1155a7f0f2d25f903 (patch)
tree2d6534b91af03f3a358021d25913caf687923211
parentf47ad1af27fdb5abda851d4d25d8fcedd0d64417 (diff)
downloademacs-236beba0c2cf9b757f7a25f1155a7f0f2d25f903.tar.gz
emacs-236beba0c2cf9b757f7a25f1155a7f0f2d25f903.zip
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Fix shell-operator precedence problem in previous change.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in15
2 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d2adca4044..a86343b0953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-08-20 Paul Eggert <eggert@cs.ucla.edu>
2
3 * Makefile.in (distclean, bootstrap-clean, maintainer-clean):
4 Fix shell-operator precedence problem in previous change.
5
12013-08-20 Glenn Morris <rgm@gnu.org> 62013-08-20 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (distclean, bootstrap-clean, maintainer-clean): 8 * Makefile.in (distclean, bootstrap-clean, maintainer-clean):
diff --git a/Makefile.in b/Makefile.in
index a0d91171d33..a29fd353346 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -859,8 +859,9 @@ distclean: FRC
859 (cd leim; $(MAKE) $(MFLAGS) distclean) 859 (cd leim; $(MAKE) $(MFLAGS) distclean)
860 (cd lisp; $(MAKE) $(MFLAGS) distclean) 860 (cd lisp; $(MAKE) $(MFLAGS) distclean)
861 (cd nextstep && $(MAKE) $(MFLAGS) distclean) 861 (cd nextstep && $(MAKE) $(MFLAGS) distclean)
862 [ ! -d test/automated ] || \ 862 [ ! -d test/automated ] || { \
863 cd test/automated && $(MAKE) $(MFLAGS) distclean 863 cd test/automated && $(MAKE) $(MFLAGS) distclean; \
864 }
864 ${top_distclean} 865 ${top_distclean}
865 866
866### `bootstrap-clean' 867### `bootstrap-clean'
@@ -880,8 +881,9 @@ bootstrap-clean: FRC
880 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) 881 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
881 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) 882 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
882 (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean) 883 (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean)
883 [ ! -d test/automated ] || \ 884 [ ! -d test/automated ] || { \
884 cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean 885 cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean; \
886 }
885 [ ! -f config.log ] || mv -f config.log config.log~ 887 [ ! -f config.log ] || mv -f config.log config.log~
886 ${top_bootclean} 888 ${top_bootclean}
887 889
@@ -902,8 +904,9 @@ top_maintainer_clean=\
902maintainer-clean: bootstrap-clean FRC 904maintainer-clean: bootstrap-clean FRC
903 (cd src; $(MAKE) $(MFLAGS) maintainer-clean) 905 (cd src; $(MAKE) $(MFLAGS) maintainer-clean)
904 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) 906 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
905 [ ! -d test/automated ] || \ 907 [ ! -d test/automated ] || { \
906 cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean 908 cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean; \
909 }
907 ${top_maintainer_clean} 910 ${top_maintainer_clean}
908 911
909### This doesn't actually appear in the coding standards, but Karl 912### This doesn't actually appear in the coding standards, but Karl