aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-05-13 18:35:13 +0000
committerStefan Monnier2008-05-13 18:35:13 +0000
commita5cd8bed3becd6352821895903c78cd13b53252a (patch)
tree91eeb5e6c856025e04f39542ad2937e525f638f6
parent6a9cbb8592b19d2abd9c75cc307a0813322a5002 (diff)
downloademacs-a5cd8bed3becd6352821895903c78cd13b53252a.tar.gz
emacs-a5cd8bed3becd6352821895903c78cd13b53252a.zip
(bootstrap-prepare): Don't chmod files.
(autoloads): Do it here instead, where it's actually needed.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in9
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 @@
12008-05-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * Makefile.in (bootstrap-prepare): Don't chmod files.
4 (autoloads): Do it here instead, where it's actually needed.
5
12008-05-13 Chong Yidong <cyd@stupidchicken.com> 62008-05-13 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * tool-bar.el (tool-bar-make-keymap): Account for the optional 8 * 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
117 echo Directories: $$wins; \ 117 echo Directories: $$wins; \
118 $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins 118 $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
119 119
120# The chmod +w is to handle env var CVSREAD=1. Files named
121# are identified by being the value of `generated-autoload-file'.
120autoloads: $(emacs-deps) $(LOADDEFS) doit 122autoloads: $(emacs-deps) $(LOADDEFS) doit
123 chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
124 $(lisp)/emacs-lisp/cl-loaddefs.el
121 wd=$(lisp); $(setwins_almost); \ 125 wd=$(lisp); $(setwins_almost); \
122 echo Directories: $$wins; \ 126 echo Directories: $$wins; \
123 $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins 127 $(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)
307# an up-to-date copy of loaddefs.el that is uncorrupted by 311# an up-to-date copy of loaddefs.el that is uncorrupted by
308# local changes. (Because loaddefs.el is an automatically generated 312# local changes. (Because loaddefs.el is an automatically generated
309# file, we don't want to store it in the source repository). 313# file, we don't want to store it in the source repository).
310#
311# The chmod +w is to handle env var CVSREAD=1. Files named
312# are identified by being the value of `generated-autoload-file'.
313 314
314bootstrap-prepare: 315bootstrap-prepare:
315 if test -x $(EMACS); then \ 316 if test -x $(EMACS); then \
316 $(MAKE) $(MFLAGS) autoloads; \ 317 $(MAKE) $(MFLAGS) autoloads; \
317 fi 318 fi
318 chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
319 $(lisp)/emacs-lisp/cl-loaddefs.el
320 319
321maintainer-clean: distclean bootstrap-clean 320maintainer-clean: distclean bootstrap-clean
322 cd $(lisp); rm -f $(AUTOGENEL) 321 cd $(lisp); rm -f $(AUTOGENEL)