summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-15 11:31:30 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-15 11:31:30 +0000
commit850f38b2c1e65b24d639ce8f61c5821ee1604819 (patch)
treee8871b1024226ce6b3c11c37dd8315cd190296a6 /Build
parent05d7395ed18ddec8c4a339adb64708ba7a8c52d0 (diff)
luaTeX build fix
git-svn-id: svn://tug.org/texlive/trunk@17038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/Makefile.in4
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luamisc.am4
3 files changed, 9 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 1eaac0518d8..08eaebd480c 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1701,8 +1701,8 @@ libluasocket_a_SOURCES = \
libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a
libluamisc_a_CPPFLAGS = \
$(ZLIB_INCLUDES) \
- -I$(top_srcdir)/luatexdir/lua51 \
- -I$(top_srcdir)/luatexdir/zziplib
+ $(ZZIPLIB_INCLUDES) \
+ -I$(top_srcdir)/luatexdir/lua51
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
libluamisc_a_SOURCES = \
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index d6e351b062c..350c16e95e2 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/luamisc.am (libluamisc_a_CPPFLAGS): Adapt to zziplib now
+ in ../../../libs/zziplib/.
+
2010-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Moved zziplib/ to ../../../libs/zziplib.
diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am
index 7fada385fce..07a80dab334 100644
--- a/Build/source/texk/web2c/luatexdir/am/luamisc.am
+++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am
@@ -14,8 +14,8 @@ $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES)
libluamisc_a_CPPFLAGS = \
$(ZLIB_INCLUDES) \
- -I$(top_srcdir)/luatexdir/lua51 \
- -I$(top_srcdir)/luatexdir/zziplib
+ $(ZZIPLIB_INCLUDES) \
+ -I$(top_srcdir)/luatexdir/lua51
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
libluamisc_a_SOURCES = \