summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/mplibdir
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/mplibdir')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/mplibdir/am/libmplib.am4
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am2
3 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 7269d232d42..6de9066565d 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,4 +1,10 @@
+2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/libmplib.am (libmplib_a_CPPFLAGS): Add $(AM_CPPFLAGS).
+ * am/mplib.am (mpost_CPPFLAGS): Add $(AM_CPPFLAGS).
+
2010-05-31 Taco Hoekwater <taco@luatex.org>
+
* mp.w (mp_set_output_file_name): prevent reallocation of
string pool during output file name generation.
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am
index 57bd47dae53..c2cfc416272 100644
--- a/Build/source/texk/web2c/mplibdir/am/libmplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am
@@ -1,13 +1,13 @@
## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## libmplib.a, used by MetaPost and luaTeX
##
EXTRA_LIBRARIES += libmplib.a
-libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir
+libmplib_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
libmplib_a_CFLAGS = $(WARNING_CFLAGS)
## libmplib C sources
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 483a895046e..ad5a112d54d 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -10,7 +10,7 @@ bin_PROGRAMS += mpost
endif MP
EXTRA_PROGRAMS += mpost
-mpost_CPPFLAGS = -I$(srcdir)/mplibdir
+mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
mpost_CFLAGS = $(WARNING_CFLAGS)
mpost_DEPENDENCIES = libmplib.a
mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm