X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fuci%2FMakefile;h=f6ec08f0e911027f0e8f6ef5377b08ba0626664f;hb=6ee29826520a02f8eb2c9ce5e7ee0c66b27500ed;hp=4c07edf3b3a0d1b687223b1fa81effea53958dbb;hpb=ba96dc71c9ba9fa8e836b0f0e34756033076c4af;p=openwrt-10.03%2F.git

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 4c07edf3b..f6ec08f0e 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 UCI_VERSION=0.3
-UCI_RELEASE=1
+UCI_RELEASE=4
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
@@ -17,8 +17,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=d1c7a1980b25f13f3c415b246051c758
-
+PKG_MD5SUM:=73288ab9bd202bed27b00736d48e190d
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -45,16 +44,27 @@ define Package/uci-sh
   TITLE:=Old shell/awk implementation of UCI
 endef
 
+define Package/libuci-lua
+  SECTION=libs
+  CATEGORY=Libraries
+  DEPENDS:=+libuci +lua
+  TITLE:=Lua plugin for UCI
+endef
+
 define Build/Configure
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+UCI_MAKEOPTS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		COPTS="$(TARGET_CFLAGS)" \
 		DEBUG="$(DEBUG)" \
 		VERSION="$(UCI_VERSION)" \
+		CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
 		OS="Linux"
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)
 endef
 
 define Package/libuci/install
@@ -62,6 +72,11 @@ define Package/libuci/install
 	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
 endef
 
+define Package/libuci-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/5.1
+	$(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/5.1
+endef
+
 define Package/uci/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
@@ -82,4 +97,5 @@ endef
 
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
+$(eval $(call BuildPackage,libuci-lua))
 $(eval $(call BuildPackage,uci-sh))