diff mbox series

[OpenWrt-Devel] uci: install from ipkg-install

Message ID 20200220035627.490891-1-rosenp@gmail.com
State Changes Requested
Delegated to: Petr Štetiar
Headers show
Series [OpenWrt-Devel] uci: install from ipkg-install | expand

Commit Message

Rosen Penev Feb. 20, 2020, 3:56 a.m. UTC 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 package/system/uci/Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index 5c2b68f00a..d0a94ee57b 100644
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -22,6 +22,7 @@  PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
+CMAKE_INSTALL:=1
 PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
@@ -61,29 +62,21 @@  CMAKE_OPTIONS = \
 
 define Package/libuci/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuci.so* $(1)/lib/
 endef
 
 define Package/libuci-lua/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/uci.so $(1)/usr/lib/lua/
 endef
 
 define Package/uci/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uci $(1)/sbin/
 	$(CP) ./files/* $(1)/
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/uci{,_config,_blob,map}.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
-endef
-
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
 $(eval $(call BuildPackage,libuci-lua))