summaryrefslogtreecommitdiffhomepage
path: root/contrib/package
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-27 08:53:40 +0000
committerSteven Barth <steven@midlink.org>2008-08-27 08:53:40 +0000
commitd463d0b8357764ca9018549fa624c428f56fcd87 (patch)
tree5ef47bb6549a33c40415774b949fa23be5cfd3cb /contrib/package
parent9d0c00590d2e232d66588567da2048fc64ef940a (diff)
Renamed reworked UCI API to uci2 to allow a peaceful coexistence with the old one
Minor bugfixes
Diffstat (limited to 'contrib/package')
-rw-r--r--contrib/package/luci/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index d2fceedc9..0b178b08b 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -102,7 +102,6 @@ define Package/luci-core
$(call Package/luci/libtemplate)
DEPENDS:=+lua +luaposix +bitlib
TITLE:=LuCI core libraries
- SUBMENU:=!!! DISABLE Libraries -> libuci-lua !!! IT WILL BREAK LUCI !!!
endef
define Package/luci-core/install
@@ -149,14 +148,14 @@ endef
define Package/luci-uci
$(call Package/luci/libtemplate)
- DEPENDS+=+libuci @!PACKAGE_libuci-lua
+ DEPENDS+=+libuci
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/uci.so $(1)/usr/lib/lua
+ $(CP) $(PKG_BUILD_DIR)/contrib/uci/dist/usr/lib/lua/uci2.so $(1)/usr/lib/lua
endef