diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-07-16 07:52:30 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-07-16 07:52:30 +0000 |
| commit | 18e4464e63053be33764cda1a3a50a60a3ebb82a (patch) | |
| tree | 1655d2a176ba33f525ced3c6b72565bd71633ba9 /Build/source/texk/web2c/xetexdir/am | |
| parent | 7a00b27579c631f2389ee63ed38cea662ec78da1 (diff) | |
texk/web2c: build fixes
git-svn-id: svn://tug.org/texlive/trunk@14276 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/am')
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index e55f89af3da..295c9a186b4 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -16,10 +16,12 @@ nodist_EXTRA_xetex_SOURCES = dummy.cxx libxetex = libxetex.a xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir -## Must add freetype2 includes as early as possible to avoid +## Must add icu first to avoid an installed version. +xetex_cppflags += $(ICU_INCLUDES) +## Must add freetype2 includes early to avoid ## freetype1/freetype2 confusion -- what a mess. xetex_cppflags += $(FREETYPE2_INCLUDES) -xetex_cppflags += $(ICU_INCLUDES) $(TECKIT_INCLUDES) +xetex_cppflags += $(TECKIT_INCLUDES) xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) xetex_dependencies = $(proglib) xetex_dependencies += $(ICU_DEPEND) $(TECKIT_DEPEND) |