update-subdirs: Don't set no-byte-compile twice (bug#10260).

lisp/makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.

4 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d74b5bafcd..507848b63b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * update-subdirs: Don't set no-byte-compile twice (bug#10260).
+
 2011-12-10  Jan Djärv  <jan.h.d@swipnet.se>
 
         * configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74fc51c5e69..c023f583d5f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.
+
 2011-12-10  Eli Zaretskii  <eliz@gnu.org>
 
         * textmodes/texnfo-upd.el: Update commentary.  Add a warning not
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index c844a8f6630..c8e535d4ac0 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -232,12 +232,15 @@ $(lisp)/subdirs.el:
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-        echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
-        echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el
+        echo ;; In load-path, after this directory should come> $(lisp)/subdirs.el
         echo ;; certain of its subdirectories.  Here we specify them.>> $(lisp)/subdirs.el
         echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
         @for %%d in ($(WINS_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el
         echo ))>> $(lisp)/subdirs.el
+        echo ;; Local Variables:>> $(lisp)/subdirs.el
+        echo ;; version-control: never>> $(lisp)/subdirs.el
+        echo ;; no-byte-compile: t>> $(lisp)/subdirs.el
+        echo ;; End:>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
         $(srcdir)/update-subdirs $(lisp); \
diff --git a/update-subdirs b/update-subdirs
index dfd594ae781..fadbab84e20 100755
--- a/update-subdirs
+++ b/update-subdirs
@@ -41,8 +41,7 @@ if [ "x$subdirs" = x ]; then
   rm -f subdirs.el
 else
   rm -f subdirs.el~
-  echo ";; -*- no-byte-compile: t -*-
-;; In load-path, after this directory should come
+  echo ";; 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: