freetype: -config & .pc files cleanup & fixes

Fix libdir as well in freetype-config, merge both freetype2.pc fixes into a single one

Signed-off-by: Nicolas Thill <nico@openwrt.org>

diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile
index c96f9284912607dff1b1fb4fa664a4e6e76effd6..da9d45fe9ae0f6d643b83e5813127827e24a8190 100644 (file)
--- a/libs/freetype/Makefile
+++ b/libs/freetype/Makefile
@@ -65,13 +65,12 @@ define Build/InstallDev
 
        $(SED) \
                's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",; \
-                s,^\(includedir\)=.*,\1="$(STAGING_DIR)/usr/include",' \
+                s,^\(includedir\)=.*,\1="$(STAGING_DIR)/usr/include",; \
+                s,^\(libdir\)=.*,\1="$(STAGING_DIR)/usr/lib",' \
                 $(2)/bin/freetype-config
        $(SED) \
-               's,/usr/include,$$$${prefix}/include,g' \
-                $(1)/usr/lib/pkgconfig/freetype2.pc
-       $(SED) \
-               's,/usr/lib,$$$${exec_prefix}/lib,g' \
+               's,/usr/include,$$$${prefix}/include,g; \
+                s,/usr/lib,$$$${exec_prefix}/lib,g' \
                 $(1)/usr/lib/pkgconfig/freetype2.pc
 endef