aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2013-10-23 19:15:16 -0700
committerGlenn Morris2013-10-23 19:15:16 -0700
commiteb9a36619e5ba70079fc098a38e2d8be721d5b0b (patch)
treec83eae4694f8fb91bf8c0856ff37aab2977ff126 /src
parent6f317c2faaa9aa00f2f9460e1d3dd45041583684 (diff)
downloademacs-eb9a36619e5ba70079fc098a38e2d8be721d5b0b.tar.gz
emacs-eb9a36619e5ba70079fc098a38e2d8be721d5b0b.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ad9888632fd..09d7c66c1cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-10-24 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (abs_top_srcdir): New, set by configure.
4
12013-10-23 Dmitry Antipov <dmantipov@yandex.ru> 52013-10-23 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 Adjust recent font-related changes to fix bug#15686. 7 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@
28# Here are the things that we expect ../configure to edit. 28# Here are the things that we expect ../configure to edit.
29# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. 29# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
30srcdir = @srcdir@ 30srcdir = @srcdir@
31abs_top_srcdir=@abs_top_srcdir@ # MinGW CPPFLAGS may use this
31ntsource = $(srcdir)/../nt 32ntsource = $(srcdir)/../nt
32abs_builddir = @abs_builddir@ 33abs_builddir = @abs_builddir@
33VPATH = $(srcdir) 34VPATH = $(srcdir)