aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-12-17 17:27:35 +0000
committerEli Zaretskii2005-12-17 17:27:35 +0000
commitc3d49b7a3100df3ca8bf02b69c6322ab1fa6ccf1 (patch)
treea29dab6db04b576cef837ba887978108ce0f00fe
parentbb49fc13a6545c55207cbe74b8a4021144b91bbf (diff)
downloademacs-c3d49b7a3100df3ca8bf02b69c6322ab1fa6ccf1.tar.gz
emacs-c3d49b7a3100df3ca8bf02b69c6322ab1fa6ccf1.zip
(autoloads, custom-deps): Warn that parts of commands enclosed in $(ARGQUOTE)s
should not be split between two lines, as that will break with GNU Make >3.80, when sh.exe is used and arg quoting is with '..'. (autoloads): Don't break the quoted --eval expression between several lines.
-rw-r--r--lisp/makefile.w32-in10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 31e31442378..35b9f1cbd28 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -97,6 +97,8 @@ doit:
97 97
98$(lisp)/cus-load.el: 98$(lisp)/cus-load.el:
99 touch $@ 99 touch $@
100# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
101# this can break with GNU Make 3.81 and later if sh.exe is used.
100custom-deps: $(lisp)/cus-load.el doit 102custom-deps: $(lisp)/cus-load.el doit
101 @echo Directories: $(WINS) 103 @echo Directories: $(WINS)
102 -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) 104 -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
@@ -150,13 +152,13 @@ loaddefs.el-CMD:
150# including a drive letter and any leading directories, so the generated 152# including a drive letter and any leading directories, so the generated
151# loaddefs.el will mention file names that on other machine reference 153# loaddefs.el will mention file names that on other machine reference
152# possibly non-existent directories. 154# possibly non-existent directories.
155#
156# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
157# this can break with GNU Make 3.81 and later if sh.exe is used.
153autoloads: $(lisp)/loaddefs.el doit 158autoloads: $(lisp)/loaddefs.el doit
154 @echo Directories: . $(WINS) 159 @echo Directories: . $(WINS)
155 $(emacs) -l autoload \ 160 $(emacs) -l autoload \
156 --eval $(ARGQUOTE)(setq find-file-hook nil \ 161 --eval $(ARGQUOTE)(setq find-file-hook nil find-file-suppress-same-file-warnings t generated-autoload-file $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
157 find-file-suppress-same-file-warnings t \
158 generated-autoload-file \
159 $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
160 -f batch-update-autoloads . $(WINS) 162 -f batch-update-autoloads . $(WINS)
161 163
162$(lisp)/subdirs.el: 164$(lisp)/subdirs.el: