massive Makefile cleanup, add missing 'svn:keywords' property

[packages.git] / net / rp-l2tp / Makefile

diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index 37ea89e..d6ee87f 100644 (file)
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=rp-l2tp
 PKG_VERSION:=0.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9
 
-PKG_SOURCE_URL:=@SF/rp-l2tp
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/rp-l2tp
+PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -22,41 +22,50 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/rp-l2tpd
+define Package/rp-l2tpd/Default
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=an L2TP (Layer 2 Tunneling Protocol) daemon
-  DESCRIPTION:=An L2TP (Layer 2 Tunneling Protocol) daemon.
+  TITLE:=Roaring Penguin L2TP
+  DESCRIPTION:=\
+       Roaring Penguin L2TP (Layer 2 Tunneling Protocol) implementation.
   URL:=http://sourceforge.net/projects/rp-l2tp/
+endef
+
+define Package/rp-l2tpd
+  $(call Package/rp-l2tpd/Default)
+  TITLE+= daemon
   MENU:=1
 endef
 
 define Package/rp-l2tpd-mod-cmd
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/rp-l2tpd/Default)
   DEPENDS:=rp-l2tpd
-  TITLE:=a simple command handler for the L2TP daemon
+  TITLE:=Simple command handler for the RR L2TP daemon
 endef
 
 define Package/rp-l2tpd-mod-ppp
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/rp-l2tpd/Default)
   DEPENDS:=rp-l2tpd
-  TITLE:=a PPP handler for the L2TP daeomon
+  TITLE:=PPP handler for the RR L2TP daeomon
 endef
 
+# uses GNU configure
+
 define Build/Compile
-  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
 endef
 
 define Package/rp-l2tpd/install        
        install -d -m0755 $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/l2tp.conf.example $(1)/etc/l2tp.conf
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd
        install -d -m0755 $(1)/usr/lib/l2tp
        install -d -m0755 $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tpd $(1)/usr/sbin/
+       install -d -m0755 $(1)/etc/init.d
+       install -m0755 ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd
 endef
 
 define Package/rp-l2tpd-mod-cmd/install        
@@ -74,5 +83,3 @@ endef
 $(eval $(call BuildPackage,rp-l2tpd))
 $(eval $(call BuildPackage,rp-l2tpd-mod-cmd))
 $(eval $(call BuildPackage,rp-l2tpd-mod-ppp))
-
-