From 115c4e37514eb41e184ae025d18be23267762c06 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 24 Jan 2019 12:18:33 +0100 Subject: [PATCH] lucihttp: fix library packaging after 0dd887883 Adjust ABI_VERSION and install recipes accordingly. Fixes: 0dd887883 ("lucihttp: update to latest Git HEAD") Signed-off-by: Jo-Philipp Wich (backported from commit c8e95785869ebb2862b524b96568f2ea20ce9b8c) --- contrib/package/lucihttp/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/package/lucihttp/Makefile b/contrib/package/lucihttp/Makefile index a67af3475..619c04c2c 100644 --- a/contrib/package/lucihttp/Makefile +++ b/contrib/package/lucihttp/Makefile @@ -22,8 +22,8 @@ include $(INCLUDE_DIR)/cmake.mk define Package/liblucihttp SECTION:=libs CATEGORY:=Libraries - ABI_VERSION:=$(PKG_VERSION) TITLE:=LuCI HTTP utility library + ABI_VERSION:=0 endef define Package/liblucihttp-lua @@ -40,9 +40,16 @@ CMAKE_OPTIONS = \ -DBUILD_LUA=$(if $(CONFIG_PACKAGE_liblucihttp-lua),ON,OFF) \ -DBUILD_TESTS=OFF +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblucihttp.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ +endef + define Package/liblucihttp/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblucihttp.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblucihttp.so.* $(1)/usr/lib/ endef define Package/liblucihttp-lua/install -- 2.25.1