diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-22 18:17:33 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-22 18:17:33 +0000 |
commit | 633c2bc993d2ad14ecf137836f22eef08805a3b5 (patch) | |
tree | 784c479c7046d0dbf7cbfb9446c7762b5e1bb494 /Build/source/libs/freetype | |
parent | 62b00fcce4ced507597a1c9b18116b781f0d1a9e (diff) |
build fix for freetype2 and macosx (preliminary)
git-svn-id: svn://tug.org/texlive/trunk@12798 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype')
-rw-r--r-- | Build/source/libs/freetype/Makefile.am | 7 | ||||
-rw-r--r-- | Build/source/libs/freetype/Makefile.in | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am index 0dd6397767a..e5842f97d36 100644 --- a/Build/source/libs/freetype/Makefile.am +++ b/Build/source/libs/freetype/Makefile.am @@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## DISTFILES contains a directory and files in that directory. EXTRA_DIST = $(FREETYPE_TREE) -## in case of an SVN repository +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn` @@ -31,8 +31,8 @@ ft-build/Makefile: --prefix=$(abs_builddir)/ft-install \ --includedir=$(abs_builddir) -## Unfortunately the FreeType build system installs the headers after the library; -## to get our dependencies right we wait for a second and then touch the library. +# Unfortunately the FreeType build system installs the headers after the library; +# to get our dependencies right we wait for a second and then touch the library. libttf.a: ft-build/Makefile rm -rf ft-install cd ft-build/lib \ @@ -41,7 +41,6 @@ libttf.a: ft-build/Makefile mv ft-install/lib/libttf.a . sleep 1 touch libttf.a - rm -rf ft-install clean-local: rm -rf libttf.a freetype ft-build ft-install diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in index 4120063de74..3ce20b9fd07 100644 --- a/Build/source/libs/freetype/Makefile.in +++ b/Build/source/libs/freetype/Makefile.in @@ -416,6 +416,7 @@ uninstall-am: pdf-am ps ps-am uninstall uninstall-am +# in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn` @@ -428,6 +429,8 @@ ft-build/Makefile: --prefix=$(abs_builddir)/ft-install \ --includedir=$(abs_builddir) +# Unfortunately the FreeType build system installs the headers after the library; +# to get our dependencies right we wait for a second and then touch the library. libttf.a: ft-build/Makefile rm -rf ft-install cd ft-build/lib \ @@ -436,7 +439,6 @@ libttf.a: ft-build/Makefile mv ft-install/lib/libttf.a . sleep 1 touch libttf.a - rm -rf ft-install clean-local: rm -rf libttf.a freetype ft-build ft-install |