X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fl2tpd%2FMakefile;h=c503580cba0f7d0c9cadabd148fdb3aeecc13175;hp=a3441ecd358c2a4ae625bb354d6a3b69d6565e7f;hb=761cb103d9fe9d076ec31a9be42b7b7e3385ff8d;hpb=c396643250996b80aaf07df1ea183175157c8b64

diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index a3441ecd35..c503580cba 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -1,9 +1,9 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -11,14 +11,12 @@ PKG_NAME:=l2tpd
 PKG_VERSION:=0.70pre
 PKG_UPSTREAM_VERSION:=0.70-pre20031121
 PKG_RELEASE:=4.1
-PKG_MD5SUM:=3f2707b6e16a8cb72e7bf64f574202fa
 
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/l2tpd
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_UPSTREAM_VERSION).orig.tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/l2tpd
+PKG_MD5SUM:=3f2707b6e16a8cb72e7bf64f574202fa
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).orig
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,12 +24,15 @@ define Package/l2tpd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon
-  DESCRIPTION:=A layer 2 tunneling protocol implementation.\\\
-l2tpd is the open source implementation of the L2TP tunneling\\\
-protocol (RFC2661). It does implement both LAC and LNS role\\\
-in a L2TP networking architecture. The main goal of this protocol is\\\
-to tunnel PPP frame trough an ip network.\\\
   URL:=http://l2tpd.sourceforge.net/
+  SUBMENU:=VPN
+endef
+
+define Package/l2tpd/description
+	l2tpd is the open source implementation of the L2TP tunneling 
+	protocol (RFC2661). It does implement both LAC and LNS role 
+	in a L2TP networking architecture. The main goal of this protocol is 
+	to tunnel PPP frame trough an ip network.
 endef
 
 define Package/l2tpd/conffiles
@@ -40,21 +41,20 @@ define Package/l2tpd/conffiles
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CC=$(TARGET_CC) \
-		CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION"
+	$(call Build/Compile/Default, \
+		CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION" \
+	)
 endef
 
 define Package/l2tpd/install	
-	install -d -m0755 $(1)/etc/l2tpd
-	install -m0644 ./files/l2tpd.conf $(1)/etc/l2tpd/
-	install -d -m0755 $(1)/etc/ppp
-	install -m0644 ./files/options.l2tpd $(1)/etc/ppp/
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/l2tpd.init $(1)/etc/init.d/l2tpd
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/l2tpd
+	$(INSTALL_DATA) ./files/l2tpd.conf $(1)/etc/l2tpd/
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_DATA) ./files/options.l2tpd $(1)/etc/ppp/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/l2tpd.init $(1)/etc/init.d/l2tpd
 endef
 
 $(eval $(call BuildPackage,l2tpd))