X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fpepperspot%2FMakefile;h=9f29b434794d6aaba814c55eaa31b60bce910ff9;hb=bf84694cf1adffa875c75e52fce663d82d9aa2ce;hp=1e7257a3e5f852b7c071745041dda69062b808b9;hpb=e86dc1cec2710ed6d057d6a4553c2ee8a77a0e4c;p=packages.git

diff --git a/net/pepperspot/Makefile b/net/pepperspot/Makefile
index 1e7257a3e..9f29b4347 100644
--- a/net/pepperspot/Makefile
+++ b/net/pepperspot/Makefile
@@ -1,20 +1,21 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
+#
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pepperspot
-PKG_VERSION:=0.1
+PKG_VERSION:=0.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pepperspot
-PKG_MD5SUM:=52e5861f6cae05a972b8a159be270bf7
+PKG_MD5SUM:=10e6d42be577c231135c36440d86012a
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,9 +23,9 @@ define Package/pepperspot
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-tun
   TITLE:=Wireless LAN HotSpot controller
-  URL:=http://www.pepperspot.org/
+  URL:=http://pepperspot.sourceforge.net/
+  DEPENDS:=+kmod-tun +kmod-ipv6
 endef
 
 define Package/pepperspot/description
@@ -40,17 +41,21 @@ endef
 
 # uses GNU configure
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+define Build/Prepare
+$(call Build/Prepare/Default)
+	# prevent autoconf invocation, since one the patches touched
+	# configure
+	(cd $(PKG_BUILD_DIR); \
+		touch -r Makefile.am configure.in; \
+		touch -r Makefile.in configure; \
+	)
 endef
 
 define Package/pepperspot/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/pepper
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/pepper.conf $(1)/etc/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/extra/pepper.conf $(1)/etc/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pepper $(1)/usr/sbin/
 endef