X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bcab7d9363f55d8ec433f6cb51fc24cfcbca813d..5fe04db16c68069745b6ace80b4e0f01e1e553c0:/package/6in4/Makefile

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index b9fa220df..ee53f5e3c 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=5
-PKG_RELEASE:=2
+PKG_VERSION:=10
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -18,6 +18,7 @@ define Package/6in4
   CATEGORY:=IPv6
   DEPENDS:=+ip +kmod-ipv6 +kmod-sit
   TITLE:=IPv6-in-IPv4 configuration support
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   PKGARCH:=all
 endef
 
@@ -33,11 +34,20 @@ endef
 define Build/Configure
 endef
 
-define Package/6in4/install
-	$(INSTALL_DIR) $(1)/lib/network
-	$(INSTALL_DATA) ./files/6in4.sh $(1)/lib/network/6in4.sh
+ifneq ($(CONFIG_PACKAGE_netifd),)
+  define Package/6in4/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DATA) ./files/6in4.hotplug $(1)/etc/hotplug.d/iface/90-6in4
-endef
+  endef
+else
+  define Package/6in4/install
+	$(INSTALL_DIR) $(1)/lib/network
+	$(INSTALL_DATA) ./files.old/6in4.sh $(1)/lib/network/6in4.sh
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files.old/6in4.hotplug $(1)/etc/hotplug.d/iface/90-6in4
+  endef
+endif
 
 $(eval $(call BuildPackage,6in4))