nodogsplash: fix uci configuration by fixing append_config_option

[feed/routing.git] / nodogsplash / Makefile

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index ffe35b9cff88a9495de5c6a90a356319d05a5b04..38e8f2b152811e9c9f9f6305b1c2a69b2f4b67af 100644 (file)
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -8,8 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.9_beta9.9.8
-PKG_RELEASE:=1
+PKG_FIXUP:=autoreconf
+PKG_VERSION:=0.9_beta9.9.9
+PKG_RELEASE:=5
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
+PKG_SOURCE_VERSION:=v0.9_beta9.9.9
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0+
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -20,7 +29,7 @@ define Package/nodogsplash
        CATEGORY:=Network
        DEPENDS:=+libpthread +iptables-mod-ipopt
        TITLE:=Open public network gateway daemon
-       URL:=https://github.com/mwarning/nodogsplash
+       URL:=https://github.com/nodogsplash/nodogsplash
 endef
 
 define Package/nodogsplash/description
@@ -28,31 +37,24 @@ define Package/nodogsplash/description
        restricted access to an internet connection.
 endef
 
-define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
-       git clone https://github.com/mwarning/nodogsplash.git $(PKG_BUILD_DIR)
-endef
-
-#for sources inside the package
-#define Build/Prepare
-#      mkdir -p $(PKG_BUILD_DIR)
-#      $(CP) ./src/* $(PKG_BUILD_DIR)/
-#endef
-
 define Package/nodogsplash/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/nodogsplash $(1)/usr/bin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndsctl $(1)/usr/bin/
 
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) files/nodogsplash.init $(1)/etc/init.d/$(PKG_NAME)
+       $(INSTALL_BIN) files/nodogsplash.init $(1)/etc/init.d/nodogsplash
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) files/nodogsplash.config $(1)/etc/config/nodogsplash
 
        $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/htdocs/images
-       $(CP) $(PKG_BUILD_DIR)/resources/nodogsplash.conf $(1)/etc/$(PKG_NAME)/
        $(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/$(PKG_NAME)/htdocs/
        $(CP) $(PKG_BUILD_DIR)/resources/infoskel.html $(1)/etc/$(PKG_NAME)/htdocs/
        $(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/$(PKG_NAME)/htdocs/images/
 endef
 
+define Package/nodogsplash/conffiles
+/etc/nodogsplash/nodogsplash.conf
+endef
 
 $(eval $(call BuildPackage,nodogsplash))