($(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ad96d54567cb0b7cd71a0149bb3877bab1619ae..4e50b09539e1c0ffad29f8a2940605ccbe6c22a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (distclean): Depend on `clean'.
+       (clean): Delete calc/calc-loaddefs.el~ and eshell/esh-groups.el~.
+       (AUTOGENEL): Add $(lisp)/nxml/subdirs.el.
+       ($(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.
+
 2008-06-20  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index dcc495cc00e57a3fe680703b7ab5f73b821604db..bda34455993a3c549f2708d3d3430d63d5fce100 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -109,8 +109,31 @@ WINS= $(WINS_ALMOST) \
 
 doit:
 
+cus-load.el-SH:
+       echo ";;; cus-load.el --- automatically extracted custom dependencies" > $@
+       echo ";;" >> $@; echo ";;; Code:" >> $@
+       echo "\f" >> $@
+       echo ";; Local Variables:" >> $@
+       echo ";; version-control: never" >> $@
+       echo ";; no-byte-compile: t" >> $@
+       echo ";; no-update-autoloads: t" >> $@
+       echo ";; End:" >> $@
+
+cus-load.el-CMD:
+       echo ;;; cus-load.el --- automatically extracted custom dependencies> $@
+       echo ;;>> $@
+       echo ;;; Code:>> $@
+       echo.\f>> $@
+       echo ;; Local Variables:>> $@
+       echo ;; version-control: never>> $@
+       echo ;; no-byte-compile: t>> $@
+       echo ;; no-update-autoloads: t>> $@
+       echo ;; End:>> $@
+
 $(lisp)/cus-load.el:
-       touch $@
+       $(MAKE) $(MFLAGS) cus-load.el-$(SHELLTYPE)
+       mv cus-load.el-$(SHELLTYPE) $@
+
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
 custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit