diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2006-02-27 20:10:26 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2006-02-27 20:10:26 +0000 |
| commit | d5af0b72f13f2e76e92862bb89f7faa9ddd7df71 (patch) | |
| tree | 931014d9312434da334d2654cff8bc06d3d4bb59 /rules/freetype.make | |
| parent | 32afeea6833eacf059d1239b6ff37703582f7e71 (diff) | |
| download | ptxdist-d5af0b72f13f2e76e92862bb89f7faa9ddd7df71.tar.gz ptxdist-d5af0b72f13f2e76e92862bb89f7faa9ddd7df71.tar.xz | |
fix freetype
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4790 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/freetype.make')
| -rw-r--r-- | rules/freetype.make | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rules/freetype.make b/rules/freetype.make index d80883fe3..3a67764a4 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -2,7 +2,6 @@ # $Id$ # # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de> -# Pengutronix <info@pengutronix.de>, Germany # # See CREDITS for details about who has contributed to this project. # @@ -51,6 +50,7 @@ $(STATEDIR)/freetype.extract: $(freetype_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FREETYPE_DIR)) @$(call extract, $(FREETYPE_SOURCE)) + @$(call patchin, $(FREETYPE)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -60,8 +60,7 @@ $(STATEDIR)/freetype.extract: $(freetype_extract_deps_default) freetype_prepare: $(STATEDIR)/freetype.prepare FREETYPE_PATH = PATH=$(CROSS_PATH) -FREETYPE_ENV = $(CROSS_ENV) -FREETYPE_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ +FREETYPE_ENV = # # autoconf @@ -70,7 +69,6 @@ FREETYPE_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/freetype.prepare: $(freetype_prepare_deps_default) @$(call targetinfo, $@) - @$(call clean, $(FREETYPE_BUILDDIR)) cd $(FREETYPE_DIR) && \ $(FREETYPE_PATH) $(FREETYPE_ENV) \ ./configure $(FREETYPE_AUTOCONF) @@ -84,7 +82,9 @@ freetype_compile: $(STATEDIR)/freetype.compile $(STATEDIR)/freetype.compile: $(freetype_compile_deps_default) @$(call targetinfo, $@) - cd $(FREETYPE_DIR) $(FREETYPE_PATH) make + cd $(FREETYPE_DIR) && \ + $(FREETYPE_PATH) $(FREETYPE_ENV) \ + make $(FREETYPE_MAKEVARS) chmod a+x $(FREETYPE_DIR)/builds/unix/freetype-config @$(call touch, $@) |