lucihttp: fix library packaging after 0dd887883
authorJo-Philipp Wich <jo@mein.io>
Thu, 24 Jan 2019 11:18:33 +0000 (12:18 +0100)
committerJo-Philipp Wich <jo@mein.io>
Wed, 5 Jun 2019 17:44:54 +0000 (19:44 +0200)
Adjust ABI_VERSION and install recipes accordingly.

Fixes: 0dd887883 ("lucihttp: update to latest Git HEAD")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit c8e95785869ebb2862b524b96568f2ea20ce9b8c)

contrib/package/lucihttp/Makefile

index a67af34759b76d2446f959c98778437c4f804085..619c04c2cd1f2c7c50f3c285e360c1b405b45a9f 100644 (file)
@@ -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