aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-06-20 15:48:08 +0000
committerEli Zaretskii2008-06-20 15:48:08 +0000
commitd2373df5d7ab0e3bc0d55938c3bd245d4920ba7e (patch)
treeb21725effb928dbd15e447925a8652acd315ac00
parent6eb5ddb8e5c5b9ba4b68205f8c0c3093655342f9 (diff)
downloademacs-d2373df5d7ab0e3bc0d55938c3bd245d4920ba7e.tar.gz
emacs-d2373df5d7ab0e3bc0d55938c3bd245d4920ba7e.zip
($(lisp)/cus-load.el): Don't use `touch'. Instead, generate an empty
cus-load.el with `echo', and include "Local Variables" section to prevent the empty file from being compiled. (cus-load.el-SH, cus-load.el-CMD): New SHELLTYPE-specific targets that generate an empty cus-load.el.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/makefile.w32-in25
2 files changed, 35 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ad96d54567..4e50b09539e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12008-06-20 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (distclean): Depend on `clean'.
4 (clean): Delete calc/calc-loaddefs.el~ and eshell/esh-groups.el~.
5 (AUTOGENEL): Add $(lisp)/nxml/subdirs.el.
6 ($(lisp)/cus-load.el): Don't use `touch'. Instead, generate an
7 empty cus-load.el with `echo', and include "Local Variables"
8 section to prevent the empty file from being compiled.
9 (cus-load.el-SH, cus-load.el-CMD): New SHELLTYPE-specific targets
10 that generate an empty cus-load.el.
11
12008-06-20 Juanma Barranquero <lekktu@gmail.com> 122008-06-20 Juanma Barranquero <lekktu@gmail.com>
2 13
3 * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): 14 * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index dcc495cc00e..bda34455993 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -109,8 +109,31 @@ WINS= $(WINS_ALMOST) \
109 109
110doit: 110doit:
111 111
112cus-load.el-SH:
113 echo ";;; cus-load.el --- automatically extracted custom dependencies" > $@
114 echo ";;" >> $@; echo ";;; Code:" >> $@
115 echo " " >> $@
116 echo ";; Local Variables:" >> $@
117 echo ";; version-control: never" >> $@
118 echo ";; no-byte-compile: t" >> $@
119 echo ";; no-update-autoloads: t" >> $@
120 echo ";; End:" >> $@
121
122cus-load.el-CMD:
123 echo ;;; cus-load.el --- automatically extracted custom dependencies> $@
124 echo ;;>> $@
125 echo ;;; Code:>> $@
126 echo. >> $@
127 echo ;; Local Variables:>> $@
128 echo ;; version-control: never>> $@
129 echo ;; no-byte-compile: t>> $@
130 echo ;; no-update-autoloads: t>> $@
131 echo ;; End:>> $@
132
112$(lisp)/cus-load.el: 133$(lisp)/cus-load.el:
113 touch $@ 134 $(MAKE) $(MFLAGS) cus-load.el-$(SHELLTYPE)
135 mv cus-load.el-$(SHELLTYPE) $@
136
114# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as 137# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
115# this can break with GNU Make 3.81 and later if sh.exe is used. 138# this can break with GNU Make 3.81 and later if sh.exe is used.
116custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit 139custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit