From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 17 Dec 2005 17:27:35 +0000 (+0000)
Subject: (autoloads, custom-deps): Warn that parts of commands enclosed in $(ARGQUOTE)s
X-Git-Tag: emacs-pretest-22.0.90~5222
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3d49b7a3100df3ca8bf02b69c6322ab1fa6ccf1;p=emacs.git

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

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:
 
 $(lisp)/cus-load.el:
 	touch $@
+# 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 doit
 	@echo Directories: $(WINS)
 	-$(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:
 # including a drive letter and any leading directories, so the generated
 # loaddefs.el will mention file names that on other machine reference
 # possibly non-existent directories.
+#
+# 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.
 autoloads: $(lisp)/loaddefs.el doit
 	@echo Directories: . $(WINS)
 	$(emacs) -l autoload \
-		--eval $(ARGQUOTE)(setq find-file-hook nil \
-			find-file-suppress-same-file-warnings t \
-			generated-autoload-file \
-			  $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
+		--eval $(ARGQUOTE)(setq find-file-hook nil find-file-suppress-same-file-warnings t generated-autoload-file $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
 		-f batch-update-autoloads . $(WINS)
 
 $(lisp)/subdirs.el: