X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ipv6%2Faiccu%2FMakefile;h=34e6428b589e58cb18abda863a60fae8c11ef1b1;hb=3346a97b48dd8e31b27c9693ea6d2c681cb9e052;hp=d7afecb7059ef029b8b1b46e49e821884d6deddf;hpb=3550939bd91a0e589acb079e7f58b780b222b481;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile
index d7afecb705..34e6428b58 100644
--- a/ipv6/aiccu/Makefile
+++ b/ipv6/aiccu/Makefile
@@ -1,16 +1,15 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-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:=aiccu
 PKG_VERSION:=20070115
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix
@@ -23,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/aiccu
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+libpthread +ntpclient +ip +kmod-sit
+  DEPENDS:=+libpthread +ntpclient +ip +kmod-sit +kmod-tun
   TITLE:=SixXS Automatic IPv6 Connectivity Client Utility
   URL:=http://www.sixxs.net/tools/aiccu/
 endef
@@ -34,17 +33,21 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-	        CC="$(TARGET_CC)" \
-	        CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DAICCU_CONSOLE -DHAS_IFHEAD -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lpthread" \
+		CC="$(TARGET_CC)" OS_NAME="Linux" OS_VERSION="$(LINUX_VERSION)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -pthread" \
 		DEBUG=0
 endef
 
+define Package/aiccu/conffiles
+/etc/config/aiccu
+endef
+
 define Package/aiccu/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/aiccu.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/aiccu.conf $(1)/etc/config/aiccu
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/aiccu.init $(1)/etc/init.d/aiccu
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface