procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt at a fix for mingw CPPFLAGS

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2013-10-23 19:15:16 -07:00
parent 6f317c2faa
commit eb9a36619e
13 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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)

1
Makefile.in
View file

@ -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

2
configure.ac
View file

@ -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

4
lib-src/ChangeLog
View file

@ -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)

1
lib-src/Makefile.in
View file

@ -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 ====================

4
lwlib/ChangeLog
View file

@ -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.

1
lwlib/Makefile.in
View file

@ -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@

4
nt/ChangeLog
View file

@ -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):

1
nt/Makefile.in
View file

@ -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 ====================

4
oldXMenu/ChangeLog
View file

@ -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.

1
oldXMenu/Makefile.in
View file

@ -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@

4
src/ChangeLog
View file

@ -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.

1
src/Makefile.in
View file

@ -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)