lede-packages-rs

commit 3d929bbd083bd7c6118596b72559bd2fed02808e
parent 81e4c788ad897fd88a1fde84472f3494ef415bf6
Author: Nicolas Thill <nico@openwrt.org>
Date:   Tue,  4 Aug 2015 02:28:36 +0200

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>

Diffstat:
M
libs/freetype/Makefile
 | 
9
++++-----

1 file changed, 4 insertions(+), 5 deletions(-)
diff --git 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