summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-05 15:54:03 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-05 15:54:03 +0000
commit82d82d39f4ff03657dd829f59b2ba3819c79f717 (patch)
treed34b41b32343032f65163d6d7a78889f5e5694f3 /Build/source/texk/web2c
parent55345a3b643b440dcf96789675a34ecdb25571d4 (diff)
fix xetex build problems
git-svn-id: svn://tug.org/texlive/trunk@12937 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/Makefile.in7
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am4
2 files changed, 5 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 5d23eb1df2b..cb7729dbfb0 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -98,10 +98,9 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
@XETEX_TRUE@am__append_13 = xetex
@XETEX_MACOSX_TRUE@am__append_14 = -DXETEX_MAC
@XETEX_MACOSX_TRUE@am__append_15 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_16 = -DXETEX_OTHER \
-@XETEX_MACOSX_FALSE@ $(FONTCONFIG_INCLUDES) $(XPDF_INCLUDES) \
-@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_17 = $(FONTCONFIG_LIBS) $(XPDF_LIBS) $(LIBPNG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_16 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_17 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
@XETEX_MACOSX_FALSE@am__append_18 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
@XETEX_GRAPHITE_TRUE@am__append_19 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
@XETEX_GRAPHITE_TRUE@am__append_20 = $(GRAPHITE_LIBS)
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 9cc78121d1a..97181592bec 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -32,8 +32,8 @@ libxetex += libxetexmm.a
else !XETEX_MACOSX
xetex_cppflags += -DXETEX_OTHER
-xetex_cppflags += $(FONTCONFIG_INCLUDES) $(XPDF_INCLUDES) $(LIBPNG_INCLUDES)
-xetex_ldadd += $(FONTCONFIG_LIBS) $(XPDF_LIBS) $(LIBPNG_LIBS)
+xetex_cppflags += $(XPDF_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
+xetex_ldadd += $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
xetex_dependencies += $(XPDF_DEPEND) $(LIBPNG_DEPEND)
endif !XETEX_MACOSX