summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Laird <danieljlaird@hotmail.com>2009-01-16 09:02:51 +0000
committerDaniel Laird <danieljlaird@hotmail.com>2009-01-16 09:02:51 +0000
commitada9baf7b9f58984cb474c4047e3d84cbb6452aa (patch)
tree9b9c7f669ac7dc6dc1018786608053b54cb7d298
parent63e0cdb206970e393e98b1e6094d944751a4e368 (diff)
downloadbuildroot-novena-ada9baf7b9f58984cb474c4047e3d84cbb6452aa.tar.gz
buildroot-novena-ada9baf7b9f58984cb474c4047e3d84cbb6452aa.zip
package/freetype/freetype.mk: Fix editing of freetype-config
Found that the editing of freetypr-config was not quite enough. Changed it and looked at freetype-config --cflags, --libs and got the values I expected. Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
-rw-r--r--package/freetype/freetype.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 7659a3a60..360d66611 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -17,7 +17,10 @@ $(eval $(call AUTOTARGETS,package,freetype))
$(FREETYPE_TARGET_INSTALL_TARGET):
-cp -a $(FREETYPE_DIR)/objs/.libs/libfreetype.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfreetype.so
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
- $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+ -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+ -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/freetype2\',g" \
+ -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
+ $(STAGING_DIR)/usr/bin/freetype-config
touch $@