summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-04-21 22:01:33 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-04-21 22:01:33 -0700
commitc6cb2f53ac46155dbe7fc87681e3bfbd3dc9138b (patch)
tree532492978f435bc4e0fce4c830499133a69d0733
parent38cc0210f3bed42829d6cea2dd512a53e581764f (diff)
downloademacs-c6cb2f53ac46155dbe7fc87681e3bfbd3dc9138b.tar.gz
emacs-c6cb2f53ac46155dbe7fc87681e3bfbd3dc9138b.tar.bz2
emacs-c6cb2f53ac46155dbe7fc87681e3bfbd3dc9138b.zip
* build-aux/update-subdirs: Don't leave subdirs.el~ behind.
It messes up 'make distclean', and contains no useful information because it's a copy of subdirs.el.
-rw-r--r--ChangeLog6
-rwxr-xr-xbuild-aux/update-subdirs4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dc6c0bfc3ec..ad354100bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ * build-aux/update-subdirs: Don't leave subdirs.el~ behind.
+ It messes up 'make distclean', and contains no useful information
+ because it's a copy of subdirs.el.
+
2013-04-18 John Marino <gnugcc@marino.st> (tiny change)
* configure.ac: Add DragonFly BSD, mostly same as FreeBSD. (Bug#14068)
diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs
index 8fdf1609e6f..3c429b8b5e4 100755
--- a/build-aux/update-subdirs
+++ b/build-aux/update-subdirs
@@ -49,8 +49,8 @@ else
;; no-byte-compile: t
;; End:" > subdirs.el~
if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then
- :; # echo "subdirs.el unchanged";
+ rm subdirs.el~
else
- mv subdirs.el~ subdirs.el
+ mv subdirs.el~ subdirs.el
fi
fi