summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-04 17:03:31 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-04 17:03:31 +0000
commit864d760d9d451e62847732d0c7eb4d973dacf93c (patch)
tree32e82de883dc8de27c863652ec8318c75d7d7204 /Build/source/libs
parent4cfbad84bfbfa4570d3d8951fd08ee86d834e577 (diff)
build system: fix FREETYPE2_LIBS for Mac OS X
git-svn-id: svn://tug.org/texlive/trunk@17312 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/freetype2/ChangeLog7
-rw-r--r--Build/source/libs/freetype2/Makefile.am3
-rw-r--r--Build/source/libs/freetype2/Makefile.in3
3 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 1db5c9c8882..315e7c2ed2d 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (ft-libs): Use again '--libs' instead of
+ '--libtool', because otherwise required Mac OS X libraries are
+ absent. Use sed to convert '-L$(abs_builddir) -lfreetype' into
+ '$(abs_builddir)/libfreetype.la'.
+
2010-01-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (ft-libs): Use '--libtool' instead of '--libs'.
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 3ff21d6f4a7..d9f20cfce0e 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -56,7 +56,8 @@ libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) install
ft-install/bin/freetype-config --cflags >ft-includes
- ft-install/bin/freetype-config --libtool >ft-libs
+ ft-install/bin/freetype-config --libs \
+ | sed -e 's,-L\(.*\) -lfreetype,\1/libfreetype.la,' >ft-libs
sleep 1
@for f in libfreetype.*; do touch $$f; done
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index f9351605302..5589fac200e 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -497,7 +497,8 @@ libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) install
ft-install/bin/freetype-config --cflags >ft-includes
- ft-install/bin/freetype-config --libtool >ft-libs
+ ft-install/bin/freetype-config --libs \
+ | sed -e 's,-L\(.*\) -lfreetype,\1/libfreetype.la,' >ft-libs
sleep 1
@for f in libfreetype.*; do touch $$f; done