HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from mh-e; up to 2012-01-03T19:41:14Z!larsi@gnus.org.
[bpt/emacs.git]
/
nt
/
gmake.defs
diff --git
a/nt/gmake.defs
b/nt/gmake.defs
index
935b253
..
b4c76cf
100644
(file)
--- a/
nt/gmake.defs
+++ b/
nt/gmake.defs
@@
-1,5
+1,5
@@
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (C) 2000-201
3
Free Software Foundation, Inc.
+# Copyright (C) 2000-201
4
Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# This file is part of GNU Emacs.
@@
-69,10
+69,18
@@
sh_output := $(shell echo)
ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
THE_SHELL = $(COMSPEC)$(ComSpec)
SHELLTYPE=CMD
ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
THE_SHELL = $(COMSPEC)$(ComSpec)
SHELLTYPE=CMD
+SWITCHCHAR=/
else
USING_SH = 1
THE_SHELL = $(SHELL)
SHELLTYPE=SH
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
endif
MAKETYPE=gmake