2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e2c495b424..c8b1e53614d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (bootstrap-prepare): Don't chmod files.
+        (autoloads): Do it here instead, where it's actually needed.
+
 2008-05-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * tool-bar.el (tool-bar-make-keymap): Account for the optional
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 538214be047..119280dcf41 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -117,7 +117,11 @@ finder-data: $(emacs-deps) autoloads doit
         echo Directories: $$wins; \
         $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
 
+# The chmod +w is to handle env var CVSREAD=1.  Files named
+# are identified by being the value of `generated-autoload-file'.
 autoloads: $(emacs-deps) $(LOADDEFS) doit
+        chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
+          $(lisp)/emacs-lisp/cl-loaddefs.el
         wd=$(lisp); $(setwins_almost); \
         echo Directories: $$wins; \
         $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
@@ -307,16 +311,11 @@ $(CAL_DIR)/hol-loaddefs.el: $(emacs-deps) $(CAL_SRC)
 # an up-to-date copy of loaddefs.el that is uncorrupted by
 # local changes.  (Because loaddefs.el is an automatically generated
 # file, we don't want to store it in the source repository).
-#
-# The chmod +w is to handle env var CVSREAD=1.  Files named
-# are identified by being the value of `generated-autoload-file'.
 
 bootstrap-prepare:
         if test -x $(EMACS); then                               \
           $(MAKE) $(MFLAGS) autoloads;                          \
         fi
-        chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
-          $(lisp)/emacs-lisp/cl-loaddefs.el
 
 maintainer-clean: distclean bootstrap-clean
         cd $(lisp); rm -f $(AUTOGENEL)