X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=ipv6%2Fradvd%2FMakefile;h=12c5bbcf4e6692b19b8ba07f659dfeeca8072a99;hp=450754fe8f548193e76bb53a371d00ae060ceb53;hb=aab531317d74943a55fadda09c2d53dfa6692172;hpb=500c50fdd9c4786d8bec343e515ef40bd5d90f3a

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index 450754fe8f..12c5bbcf4e 100644
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -1,73 +1,43 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 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:=radvd
-PKG_VERSION:=1.0
+PKG_VERSION:=1.4
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \
 		http://download.sourcemage.org/mirror
-PKG_MD5SUM:=8bce4a21757cf069f5a69e2f9bee9e5b
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=ad57121d57a716aa5db33668e4fb32c5
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/radvd
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=ipv6
+  CATEGORY:=IPv6
   TITLE:=IPv6 Routing Advertisement Daemon
-  DESCRIPTION:=IPv6 Routing Advertisement Daemon.
   URL:=http://v6web.litech.org/radvd/
 endef
 
-define Package/radvd/conffiles
-/etc/radvd.conf
+define Package/radvd/description
+IPv6 Routing Advertisement Daemon.
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--with-configfile=/etc/radvd.conf \
-			--with-logfile=/var/log/radvd.log \
-			--with-pidfile=/var/run/radvd.pid \
-	);
+	$(call Build/Configure/Default,\
+		--with-configfile=/etc/radvd.conf \
+		--with-logfile=/var/log/radvd.log \
+		--with-pidfile=/var/run/radvd.pid \
+	)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		radvd_LDADD=""
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -75,9 +45,13 @@ define Build/Compile
 		install
 endef
 
+define Package/radvd/conffiles
+/etc/config/radvd
+endef
+
 define Package/radvd/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/radvd.conf $(1)/etc/radvd.conf
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/radvd.config $(1)/etc/config/radvd
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd
 	$(INSTALL_DIR) $(1)/usr/sbin