diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 1 | ||||
| -rw-r--r-- | lwlib/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 1 | ||||
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/Makefile.in | 1 | ||||
| -rw-r--r-- | oldXMenu/ChangeLog | 4 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 1 |
13 files changed, 33 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 65d12ddd498..af9025c1080 100644 --- 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 7ad0bf13ae4..5fd926c4238 100644 --- 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 145db6a85c4..e73775e69a7 100644 --- 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 fd4209ab225..35672f22d64 100644 --- 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 3aff16fed76..e4d104e0200 100644 --- 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 5a1018f85e5..963b5baed1c 100644 --- 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 40f4a405e97..c463efb05e2 100644 --- 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 53381f1e8b5..12389607627 100644 --- 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 c29cc7e91ec..7606b31ef40 100644 --- 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 21acbe83053..a8f19210561 100644 --- 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 394bfb3ab50..f0c93e10cd4 100644 --- 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 ad9888632fd..09d7c66c1cf 100644 --- 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 ce65b190334..29acb4e7380 100644 --- 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) |