Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

[gnu-emacs] / build-aux / update-subdirs

diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs
index e20e0da6e13c431587d940279f4955412699135c..3c429b8b5e431b43cc6406e2b1f09b05768c2bc7 100755 (executable)
--- a/build-aux/update-subdirs
+++ b/build-aux/update-subdirs
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Write into $1/subdirs.el a list of subdirs of directory $1.
 
-# Copyright (C) 1994-1995, 1997, 1999, 2001-2012
-#   Free Software Foundation, Inc.
+# Copyright (C) 1994-1995, 1997, 1999, 2001-2013 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -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