Commit eb9a3661 authored by Glenn Morris's avatar Glenn Morris

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.
parent 6f317c2f
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)
......
......@@ -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
......
......@@ -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
......
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)
......
......@@ -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 ====================
......
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.
......
......@@ -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@
......
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):
......
......@@ -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 ====================
......
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.
......
......@@ -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@
......
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.
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment