[Emacs-diffs] /srv/bzr/emacs/trunk r110989: Fix bug #12955 with building under MSYS Bash.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110989
fixes bug: http://debbugs.gnu.org/12955
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-23 10:47:34 +0200
message:
  Fix bug #12955 with building under MSYS Bash.
  
   src/makefile.w32-in (globals.h, gl-stamp): Use $(SWITCHCHAR) instead
   of a literal "/".
   (gl-stamp): Invoke fc.exe directly, not through cmd.
modified:
  nt/ChangeLog
  nt/gmake.defs
  nt/nmake.defs
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-11-23 07:48:43 +0000
+++ b/nt/ChangeLog      2012-11-23 08:47:34 +0000
@@ -1,3 +1,10 @@
+2012-11-23  Eli Zaretskii  <address@hidden>
+
+       * gmake.defs (SWITCHCHAR): Define to // under MSYS, / otherwise.
+       (Bug#12955)
+
+       * nmake.defs (SWITCHCHAR): Define to /.
+
 2012-11-23  Paul Eggert  <address@hidden>
 
        Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958).

=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs     2012-10-17 19:02:44 +0000
+++ b/nt/gmake.defs     2012-11-23 08:47:34 +0000
@@ -69,10 +69,18 @@
 ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
 THE_SHELL = $(COMSPEC)$(ComSpec)
 SHELLTYPE=CMD
+SWITCHCHAR=/
 else
 USING_SH = 1
 THE_SHELL = $(SHELL)
 SHELLTYPE=SH
+# MSYS needs to double the slash in cmd-style switches to avoid
+# interpreting /x as a Posix style file name reference
+ifneq ($(MSYSTEM),)
+SWITCHCHAR=//
+else
+SWITCHCHAR=/
+endif
 endif
 
 MAKETYPE=gmake

=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs     2012-11-20 17:13:10 +0000
+++ b/nt/nmake.defs     2012-11-23 08:47:34 +0000
@@ -22,6 +22,7 @@
 
 THE_SHELL = $(COMSPEC)
 SHELLTYPE=CMD
+SWITCHCHAR=/
 
 MAKETYPE=nmake
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-23 07:48:43 +0000
+++ b/src/ChangeLog     2012-11-23 08:47:34 +0000
@@ -1,3 +1,9 @@
+2012-11-23  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in (globals.h, gl-stamp): Use $(SWITCHCHAR) instead
+       of a literal "/".  (Bug#12955)
+       (gl-stamp): Invoke fc.exe directly, not through cmd.
+
 2012-11-23  Paul Eggert  <address@hidden>
 
        Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958).

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2012-11-23 07:48:43 +0000
+++ b/src/makefile.w32-in       2012-11-23 08:47:34 +0000
@@ -229,12 +229,12 @@
 obj = $(GLOBAL_SOURCES:.c=.o)
 
 globals.h: gl-stamp
-       @cmd /c rem true
+       @cmd $(SWITCHCHAR)c rem true
 
 gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
        - $(DEL) gl-tmp
        "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g 
$(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
-       cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
+       fc.exe $(SWITCHCHAR)b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp 
globals.h
        - $(DEL) gl-tmp
        echo timestamp > $@