upstream

5 files changed, 49 insertions, 10 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 81bf6a1e105..544b964be3d 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,21 @@
+2012-02-06  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * README.W32: Removed specific version information for libXpm
+        included in the binary distribution for maintenance purposes.
+
+2012-02-05  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * README.W32: Clarification for inclusion in source tarball. (Bug#9750)
+
+        * gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.
+
+        * nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.
+
+        * makefile.w32-in (maybe-copy-distfiles)
+        (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
+        (create-tmp-dist-dir): Added to make --distfiles optional.
+        (dist): Use create-tmp-dist-dir and maybe-copy-distfiles. (Bug#10261)
+
 2012-02-04  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions
diff --git a/nt/README.W32 b/nt/README.W32
index 8f33dee2d9b..05456fd1d6d 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -3,16 +3,21 @@ See the end of the file for license conditions.
 
                            Emacs for Windows
 
-  This README file describes how to set up and run a precompiled
-  version of GNU Emacs for Windows.  This distribution can be found on
-  the ftp.gnu.org server and its mirrors:
+  This README.W32 file describes how to set up and run a precompiled
+  distribution of GNU Emacs for Windows.  You can find the precompiled
+  distribution on the ftp.gnu.org server and its mirrors:
 
-        ftp://ftp.gnu.org/gnu/emacs/windows/
+        ftp://ftp.gnu.org/gnu/emacs/windows/
 
   This server contains other distributions, including the full Emacs
   source distribution and a barebin distribution which can be installed
   over it, as well as older releases of Emacs for Windows.
 
+  Information on how to compile Emacs from sources on Windows is in
+  the files README and INSTALL in this directory.  If you received
+  this file as part of the Emacs source distribution, please read
+  those 2 files and not this one.
+
   Answers to frequently asked questions, and further information about
   this port of GNU Emacs and related software packages can be found via
   http:
@@ -123,9 +128,7 @@ See the end of the file for license conditions.
   Emacs has built in support for XBM and PPM/PGM/PBM images, and the
   libXpm library is bundled, providing XPM support (required for color
   toolbar icons and splash screen).  Source for libXpm should be available
-  on the same place as you got this binary distribution from.  The version
-  of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
-  libXpm library from X11R7.3.
+  on the same place as you got this binary distribution from.
 
   Emacs can also support some other image formats with appropriate
   libraries.  These libraries are all available as part of GTK
diff --git a/nt/gmake.defs b/nt/gmake.defs
index e58ee4f3213..6839b28b975 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -289,6 +289,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)
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index b442ca57b78..30a5f83ea00 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -257,8 +257,22 @@ install-other-dirs-gmake:
 install-shortcuts:

         "$(INSTALL_DIR)/bin/addpm" -q

 

-dist: install-bin

-        mkdir $(TMP_DIST_DIR)

+maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)

+

+maybe-copy-distfiles-CMD: doit

+        @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin

+

+maybe-copy-distfiles-SH: doit

+        @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \

+          $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin

+        fi

+

+create-tmp-dist-dir:

+        mkdir "$(TMP_DIST_DIR)"

+# Also create bin directory for dist files.

+        mkdir "$(TMP_DIST_DIR)/bin"

+

+dist: install-bin create-tmp-dist-dir maybe-copy-distfiles

         $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)

         $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)

         $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)

@@ -269,7 +283,6 @@ dist: install-bin
         $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR)

         $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR)

         $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR)

-        $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin

         $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)

         $(DEL_TREE) $(TMP_DIST_DIR)

 

diff --git a/nt/nmake.defs b/nt/nmake.defs
index a143fe65fac..2cb3113ca9a 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -203,6 +203,9 @@ DEBUG_LINK = -debug
 D = d

 !endif

 

+# gcc-specific pragma (ignore for MSVC)

+PRAGMA_SYSTEM_HEADER =

+

 !if "$(ARCH)" == "i386"

 !ifdef NOOPT

 #ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)