From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 22 Apr 2013 05:01:33 +0000 (-0700)
Subject: * build-aux/update-subdirs: Don't leave subdirs.el~ behind.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~405
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6cb2f53ac46155dbe7fc87681e3bfbd3dc9138b;p=emacs.git

* 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.
---

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