X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6b61353c0a0320ee15bb6488149735381fed62ec..3a07ffce2fe88d64f98deb072c3d35b61bb0a81a:/update-subdirs

diff --git a/update-subdirs b/update-subdirs
index 7ac5977d70..26853455e2 100755
--- a/update-subdirs
+++ b/update-subdirs
@@ -1,24 +1,24 @@
 #!/bin/sh
 # Write into $1/subdirs.el a list of subdirs of directory $1.
 
-# Copyright (C) 1994,95,97,1999,2001,2004  Free Software Foundation, Inc.
-#
+# Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
 # This file is part of GNU Emacs.
-#
-# GNU Emacs is free software; you can redistribute it and/or modify
+
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 cd $1
 for file in *; do
@@ -27,26 +27,33 @@ 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
 
 if [ "x$subdirs" = x ]; then
   rm -f subdirs.el
 else
-
-  echo ";; -*- no-byte-compile: t -*-" > subdirs.el
-
-  echo ";; In load-path, after this directory should come
-;; certain of its subdirectories.  Here we specify them." >> subdirs.el
-
-  echo "(normal-top-level-add-to-load-path '($subdirs))
+  rm -f subdirs.el~
+  echo ";; -*- no-byte-compile: t -*-
+;; In load-path, after this directory should come
+;; certain of its subdirectories.  Here we specify them.
+(normal-top-level-add-to-load-path '($subdirs))
 ;; Local" "Variables:
 ;; version-control: never
 ;; no-byte-compile: t
-;; End:" >> subdirs.el
+;; 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