summaryrefslogtreecommitdiffhomepage
path: root/contrib/package
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-27 21:32:05 +0000
committerSteven Barth <steven@midlink.org>2008-08-27 21:32:05 +0000
commit11bcdfd91aab8976c8f3e6bd6ca2fa0c45956adf (patch)
tree8abf1f85bac75ccd79b76ae704c3cc2d98fd14c2 /contrib/package
parent2cb538705485aa35c2193cacb11e103c70d8dc4e (diff)
Switch back to mainline UCI
Diffstat (limited to 'contrib/package')
-rw-r--r--contrib/package/luci/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 0b178b08b..e8a1d3698 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -148,14 +148,12 @@ endef
define Package/luci-uci
$(call Package/luci/libtemplate)
- DEPENDS+=+libuci
+ DEPENDS+=+libuci-lua
TITLE:=High-Level UCI API
endef
define Package/luci-uci/install
$(call Package/luci/install/template,$(1),libs/uci)
- $(INSTALL_DIR) $(1)/usr/lib/lua
- $(CP) $(PKG_BUILD_DIR)/contrib/uci/dist/usr/lib/lua/uci2.so $(1)/usr/lib/lua
endef
@@ -634,7 +632,7 @@ ifneq ($(CONFIG_PACKAGE_luci-json),)
PKG_SELECTED_MODULES+=libs/json
endif
ifneq ($(CONFIG_PACKAGE_luci-uci),)
- PKG_SELECTED_MODULES+=libs/uci contrib/uci
+ PKG_SELECTED_MODULES+=libs/uci
endif
ifneq ($(CONFIG_PACKAGE_luci-sys),)
PKG_SELECTED_MODULES+=libs/sys