From a97bd8867b7800ee3441e4114d86330dc624dd53 Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Wed, 5 Jan 2011 11:20:47 +0000
Subject: [PATCH] [packages] l2tpv3tun: update to 0.2, use PKG_INSTALL and
 MAKE_FLAGS, cleanup whitespace

SVN-Revision: 24907
---
 net/l2tpv3tun/Makefile | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/net/l2tpv3tun/Makefile b/net/l2tpv3tun/Makefile
index 6a1a125203..0d3e71cac0 100644
--- a/net/l2tpv3tun/Makefile
+++ b/net/l2tpv3tun/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de>
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=l2tpv3tun
-PKG_VERSION:=0.1
-PKG_RELEASE:=3
+PKG_VERSION:=0.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://www.openl2tp.org/releases/
-PKG_MD5SUM:=bed89be19360a76186f80fa7e98d57b3
+PKG_SOURCE_URL:=ftp://www.openl2tp.org/releases
+PKG_MD5SUM:=d3b4a9af652cca9f34d3eea4a7ff6041
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
@@ -31,21 +34,17 @@ define Package/l2tpv3tun/description
   L2TP v3 pseudowire tunnels.
 endef
 
-define Build/Compile
-	$(MAKE) KERNEL_HEADERS="$(LINUX_DIR)/include" -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" \
-		LD="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lnl" 
-endef
-
+MAKE_FLAGS += \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" \
+	LD="$(TARGET_CC)" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lnl"
 
 define Package/l2tpv3tun/install
-		$(INSTALL_DIR) $(1)/usr/sbin
-		$(INSTALL_BIN) $(PKG_BUILD_DIR)/l2tpv3tun $(1)/usr/sbin/
-		$(INSTALL_DIR) $(1)/lib/network
-		$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/network/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/l2tpv3tun $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/lib/network
+	$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/network/
 endef
 
 $(eval $(call BuildPackage,l2tpv3tun))
-- 
2.30.2