X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fffluci%2FMakefile;h=753fe889a60e70eb907aee78ea32c2a2777cebcf;hp=677c865ce1eac67eb3394dfc3c5157eadea70584;hb=184f13334f470141420a189220dd3b951aac4480;hpb=68d142e79287e9b5e9f980f37b546070a38fc478

diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile
index 677c865ce..753fe889a 100644
--- a/contrib/package/ffluci/Makefile
+++ b/contrib/package/ffluci/Makefile
@@ -1,8 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffluci
-PKG_VERSION:=0.2
+PKG_REV:=HEAD
+PKG_VERSION:=0.2+svn$(PKG_REV)
 PKG_RELEASE:=1
+PKG_BRANCH:=trunk
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -15,15 +23,10 @@ define Package/ffluci
   SECTION:=admin
   CATEGORY:=Administration
   TITLE:=FFLuCI
-  DEPENDS:=+liblua +luafilesystem +haserl
+  DEPENDS:=+liblua +luaposix +haserl-lua
   MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
 endef
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/ -R
-endef
-
 define Build/Configure
 endef
 
@@ -35,11 +38,14 @@ define Package/ffluci/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
 	$(INSTALL_DIR) $(1)/www/cgi-bin
 	$(INSTALL_DIR) $(1)/www/ffluci
+	$(INSTALL_DIR) $(1)/etc/config
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/usr/lib/lua/ -R
 	$(CP) $(PKG_BUILD_DIR)/contrib/media $(1)/www/ffluci/ -R
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/ffluci $(1)/www/cgi-bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.cgi $(1)/www/cgi-bin
-	$(CP) $(PKG_BUILD_DIR)/contrib/ffluci.uci $(1)/etc/config/luci
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.html $(1)/www
+	$(CP) $(PKG_BUILD_DIR)/contrib/uci/luci $(1)/etc/config/luci
+	$(CP) $(PKG_BUILD_DIR)/contrib/uci/luci_fw $(1)/etc/config/luci_fw
 	$(CP) -a ./ipkg/ffluci.postinst $(1)/CONTROL/postinst
 	$(CP) -a ./ipkg/conffiles $(1)/CONTROL/conffiles
 endef