X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a6fc3b5c539c0a35e4447a12cc395294952d7561..bdfb840ec4a5ed475c28de381447f6f1e541d5d1:/nt/gmake.defs

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 46d4acf76d..a669ffd27b 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (C) 2000-2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -95,7 +95,7 @@ THISDIR		= .
 ifdef USING_SH
 sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
 sh_output := $(shell echo foo")
-# This single quote " is to fix fintification due to previous line
+# This single quote " is to fix fontification due to previous line
 ifeq "$(sh_output)" ""
 NEW_CYGWIN = 1
 endif
@@ -245,9 +245,11 @@ CP_DIR		= cp -rf
 DEL		= rm
 DEL_TREE	= rm -r
 
+DIRNAME		= $(notdir $(CURDIR))
+
 ifdef USING_SH
 
-IFNOTSAMEDIR	= if [ ! -s ../same-dir.tst ] ; then
+IFNOTSAMEDIR	= if [ ! -s ../$(DIRNAME)_same-dir.tst ] ; then
 FOREACH		= for f in
 FORVAR		= $${f}
 FORDO		= ; do
@@ -262,7 +264,7 @@ endif
 
 else
 
-IFNOTSAMEDIR	= if not exist ../same-dir.tst
+IFNOTSAMEDIR	= if not exist ../$(DIRNAME)_same-dir.tst
 FOREACH		= for %%f in (
 FORVAR		= %%f
 FORDO		= ) do
@@ -289,6 +291,8 @@ ifdef USER_LIBS
 USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
 endif
 
+PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
+
 ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)
@@ -311,4 +315,3 @@ export XMFLAGS
 
 $(BLD)/%.o: %.c
 		$(CC) $(CFLAGS) $(CC_OUT)$@ $<
-