From: Ted Hess Date: Sat, 5 Dec 2015 21:39:31 +0000 (-0500) Subject: libshout: Make separate pkg_config files for libs. Fixes ices build X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c2cf511cf136299a358f206923a196a029e44063;p=feed%2Fpackages.git libshout: Make separate pkg_config files for libs. Fixes ices build Signed-off-by: Ted Hess --- diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile index 4559ddf899..aeff8531d1 100644 --- a/libs/libshout/Makefile +++ b/libs/libshout/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libshout PKG_VERSION:=2.3.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -70,14 +70,16 @@ CONFIGURE_VARS += \ TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link="$(STAGING_DIR)/usr/lib" +PACKAGE_CONFIG_FILE=shout$(if $(findstring $(BUILD_VARIANT),full),-full).pc + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/shout $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's| -I/usr/include||' $(1)/usr/lib/pkgconfig/shout.pc + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/$(PACKAGE_CONFIG_FILE) + $(SED) 's| -I/usr/include||' $(1)/usr/lib/pkgconfig/$(PACKAGE_CONFIG_FILE) endef define Package/libshout/install