diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-03-20 08:11:03 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-03-20 08:11:03 +0000 |
| commit | 34eeb3b2c6708aa1e4076224003015db7aaa5767 (patch) | |
| tree | 2ee9b5a77869ed87fe7946904a51ba081cb52d64 /Build/source/libs/freetype | |
| parent | 31ee521438a4e16c69efeed25691094ccde39b16 (diff) | |
build system: Avoid lib/lib64 confusion due to a config.site file
git-svn-id: svn://tug.org/texlive/trunk@25708 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype')
| -rw-r--r-- | Build/source/libs/freetype/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype/Makefile.am | 6 | ||||
| -rw-r--r-- | Build/source/libs/freetype/Makefile.in | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Build/source/libs/freetype/ChangeLog b/Build/source/libs/freetype/ChangeLog index 7212f0a629a..7651d6f4f80 100644 --- a/Build/source/libs/freetype/ChangeLog +++ b/Build/source/libs/freetype/ChangeLog @@ -1,3 +1,7 @@ +2012-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid using a 'config.site' file. + 2009-12-12 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Replace the obsolete $(mkdir_p) by $(MKDIR_P). diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am index ab79e3260a1..fb58eefce30 100644 --- a/Build/source/libs/freetype/Makefile.am +++ b/Build/source/libs/freetype/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build FreeType for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -28,10 +28,11 @@ ft-build/Makefile: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ - CC='$(CC)' \ + CC='$(CC)' CONFIG_SITE=/dev/null \ $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared --disable-nls \ --prefix=$(abs_builddir)/ft-install \ + --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) # Unfortunately the FreeType build system installs the headers after the library; @@ -41,7 +42,6 @@ libttf.a: ft-build/Makefile cd ft-build/lib \ && $(MAKE) $(AM_MAKEFLAGS) -f arch/unix/Makefile all \ && $(MAKE) $(AM_MAKEFLAGS) -f arch/unix/Makefile install - mv ft-install/lib/libttf.a . sleep 1 touch libttf.a diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in index b3d44aa2925..88043c5693c 100644 --- a/Build/source/libs/freetype/Makefile.in +++ b/Build/source/libs/freetype/Makefile.in @@ -497,10 +497,11 @@ ft-build/Makefile: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ - CC='$(CC)' \ + CC='$(CC)' CONFIG_SITE=/dev/null \ $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared --disable-nls \ --prefix=$(abs_builddir)/ft-install \ + --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) # Unfortunately the FreeType build system installs the headers after the library; @@ -510,7 +511,6 @@ libttf.a: ft-build/Makefile cd ft-build/lib \ && $(MAKE) $(AM_MAKEFLAGS) -f arch/unix/Makefile all \ && $(MAKE) $(AM_MAKEFLAGS) -f arch/unix/Makefile install - mv ft-install/lib/libttf.a . sleep 1 touch libttf.a |