diff options
author | Nicolas Thill <nico@openwrt.org> | 2015-08-04 02:28:36 +0200 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2015-08-04 02:28:36 +0200 |
commit | 3d929bbd083bd7c6118596b72559bd2fed02808e (patch) | |
tree | 19c97b52e51ba3ee86a2d5c90bc232ae86435947 | |
parent | 81e4c788ad897fd88a1fde84472f3494ef415bf6 (diff) |
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>
-rw-r--r-- | libs/freetype/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index c96f92849..da9d45fe9 100644 --- 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 |