2 files changed, 24 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 598d1fdd7b4..199c270a018 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2011-05-07  Ben Key  <bkey76@gmail.com>
+
+        * makefile.w32-in: The bootstrap-temacs rule now makes use of
+        one of two shell specific rules, either bootstrap-temacs-CMD or
+        bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical
+        to the previous implementation of the bootstrap-temacs rule.
+        The bootstrap-temacs-CMD rule is similar to the previous
+        implementation of the bootstrap-temacs rule except that it
+        makes use of the ESC_CFLAGS variable instead of the CFLAGS
+        variable.
+
+        These changes, along with some changes to nt/configure.bat,
+        nt/gmake.defs, and nt/nmake.defs, are required to extend my
+        earlier fix to add support for --cflags and --ldflags options
+        that include quotes so that it works whether make uses cmd or
+        sh as the shell.
+
 2011-05-06  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (QCdbus_type_unix_fd): Declare static.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index fb216eb16a6..e19a19645f9 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -244,9 +244,15 @@ bootstrap: bootstrap-emacs
 #
 # 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.
-bootstrap-temacs:
+bootstrap-temacs-CMD:
+        $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(ESC_CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
+
+bootstrap-temacs-SH:
         $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
 
+bootstrap-temacs:
+        $(MAKE) $(MFLAGS) bootstrap-temacs-$(SHELLTYPE)
+
 #
 # Dump an Emacs executable named bootstrap-emacs containing the
 # files from loadup.el in source form.