Attempt at a fix for mingw CPPFLAGS

* configure.ac (CPPFLAGS) [mingw32]: Use abs_top_srcdir.

* Makefile.in (abs_top_srcdir):
* lib-src/Makefile.in (abs_top_srcdir):
* lwlib/Makefile.in (abs_top_srcdir):
* nt/Makefile.in (abs_top_srcdir):
* oldXMenu/Makefile.in (abs_top_srcdir):
* src/Makefile.in (abs_top_srcdir):
New, set by configure.

diff --git a/ChangeLog b/ChangeLog
index 65d12ddd498658c6a9c49e6af10140ac632e2f3b..af9025c1080d51ff05d992081b6e4be7e68ec60a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac (CPPFLAGS) [mingw32]: Use abs_top_srcdir.
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
        * configure.ac: Explicit error for non-ASCII directories.  (Bug#15260)

diff --git a/Makefile.in b/Makefile.in
index 7ad0bf13ae41defa4b61763f7a407217d07afa96..5fd926c4238083a4646f9423eaf7011ac14f4adc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,6 +164,7 @@ bitmapdir=@bitmapdir@
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
 abs_srcdir=@abs_srcdir@
+abs_top_srcdir=@abs_top_srcdir@        # MinGW CPPFLAGS may use this
 
 # Where the manpage source files are kept.
 mansrcdir=$(srcdir)/doc/man

diff --git a/configure.ac b/configure.ac
index 145db6a85c4b558a121dd8d96c69b8bcbde32569..e73775e69a799e3499651e0c6d70c6347d0196ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4738,7 +4738,7 @@ CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
 
 if test "${opsys}" = "mingw32"; then
-  CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I $srcdir/nt/inc"
+  CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I \${abs_top_srcdir}/nt/inc"
   # Remove unneeded switches from the value of CC that goes to Makefiles
   CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"`
 fi

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fd4209ab225d6e294d0417a26027ccea4a48f5fd..35672f22d6428e53c45007bc1ba8f9e5a55be8a4 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install)

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 3aff16fed768d2620de476b4e777ab31b8c6a593..e4d104e020018b1d6da5028284b0ca8b11133084 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -84,6 +84,7 @@ VPATH=@srcdir@
 
 # The top-level source directory, also set by configure.
 top_srcdir=@top_srcdir@
+abs_top_srcdir=@abs_top_srcdir@        # MinGW CPPFLAGS may use this
 
 # ==================== Emacs-specific directories ====================
 

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 5a1018f85e5f9c7cad8417a2a564a783e83b33f6..963b5baed1c8bfc8ae5e8d132b10b3d79bbcdcae 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Makefile improvements.

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 40f4a405e97027cd16faf4989f050588c66239ea..c463efb05e2e7e8c09e33d761820e8a0e8d2feee 100644 (file)
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -23,6 +23,7 @@
 # and set up to be configured by ../configure.
 
 srcdir=@srcdir@
+abs_top_srcdir=@abs_top_srcdir@        # MinGW CPPFLAGS may use this
 VPATH=@srcdir@
 @SET_MAKE@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 53381f1e8b526aa5ab680b548e0fb2b8177d02d6..123896076270efae503fb04689d9f2d75ea6d08e 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall):

diff --git a/nt/Makefile.in b/nt/Makefile.in
index c29cc7e91ec4c6a94783ffad86ff3fef55e28a1a..7606b31ef4010d59a35a4b58d411edae5fbb56b5 100644 (file)
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -76,6 +76,7 @@ VPATH=@srcdir@
 
 # The top-level source directory, also set by configure.
 top_srcdir=@top_srcdir@
+abs_top_srcdir=@abs_top_srcdir@        # MinGW CPPFLAGS may use this
 
 # ==================== Emacs-specific directories ====================
 

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 21acbe830530a010c448988398208b42335324d0..a8f19210561159fdbeebb1e276f831bdd41b75c4 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Makefile improvements.

diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 394bfb3ab500498f547a5b5d0a80653f0bb9c511..f0c93e10cd485e109c08847177c71972d7814404 100644 (file)
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -43,6 +43,7 @@
 ### Code:
 
 srcdir=@srcdir@
+abs_top_srcdir=@abs_top_srcdir@        # MinGW CPPFLAGS may use this
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@

diff --git a/src/ChangeLog b/src/ChangeLog
index ad9888632fdd56ed3522e80479d1b90ce585bf95..09d7c66c1cf0c78287fdd0c464f244cb9c10b212 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Adjust recent font-related changes to fix bug#15686.

diff --git a/src/Makefile.in b/src/Makefile.in
index ce65b1903347b312e06af22bd822c7792f144419..29acb4e7380b02ae15e84a94993d36c7a2898955 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -28,6 +28,7 @@ SHELL = @SHELL@
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir = @srcdir@
+abs_top_srcdir=@abs_top_srcdir@        # MinGW CPPFLAGS may use this
 ntsource = $(srcdir)/../nt
 abs_builddir = @abs_builddir@
 VPATH = $(srcdir)