Merge from trunk.

[bpt/emacs.git] / update-subdirs

diff --git a/update-subdirs b/update-subdirs
index d7e7012..dfd594a 100755 (executable)
--- a/update-subdirs
+++ b/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, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1994-1995, 1997, 1999, 2001-2011
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -27,9 +27,13 @@ for file in *; do
          ;;
        *)
            if [ -d $file ]; then
-             subdirs="\"$file\" $subdirs"
+               if [ "$file" = "obsolete" ]; then
+                   subdirs="$subdirs \"$file\""
+               else
+                   subdirs="\"$file\" $subdirs"
+               fi
            fi
-         ;;
+           ;;
     esac
 done
 
@@ -45,7 +49,9 @@ else
 ;; version-control: never
 ;; no-byte-compile: t
 ;; End:" > subdirs.el~
+  if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then
+    :; # echo "subdirs.el unchanged";
+  else
   mv subdirs.el~ subdirs.el
+  fi
 fi
-
-# arch-tag: 56ebcf1b-5c30-4934-b0b4-72d374064704