X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Frp-l2tp%2FMakefile;h=405831b7cec6d078e584bd23a8ebd83d9b27038f;hb=6e6d9d4657ed0983950354fe3ac08135f4c21648;hp=37ea89eb6c4335114dcafd4ef804a481090c2449;hpb=aad785e5f48e14d5cdf9280fce4e76e07db62319;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index 37ea89eb6c..405831b7ce 100644
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -4,75 +4,64 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 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_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=@SF/rp-l2tp
+PKG_MD5SUM:=0e45d11cb4fa6c56cce6b1d119733ed9
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rp-l2tpd
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=an L2TP (Layer 2 Tunneling Protocol) daemon
-  DESCRIPTION:=An L2TP (Layer 2 Tunneling Protocol) daemon.
+  TITLE:=Roaring Penguin L2TP
   URL:=http://sourceforge.net/projects/rp-l2tp/
-  MENU:=1
+  TITLE+= daemon
+  SUBMENU:=dial-in/up
 endef
 
-define Package/rp-l2tpd-mod-cmd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=rp-l2tpd
-  TITLE:=a simple command handler for the L2TP daemon
+define Package/rp-l2tpd/description
+	Roaring Penguin L2TP (Layer 2 Tunneling Protocol) implementation.
 endef
 
-define Package/rp-l2tpd-mod-ppp
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=rp-l2tpd
-  TITLE:=a PPP handler for the L2TP daeomon
-endef
+# uses GNU configure
+MAKE_FLAGS += \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
 
-define Build/Compile
-  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
-endef
+TARGET_CFLAGS := -I$(PKG_BUILD_DIR)/libevent $(TARGET_CFLAGS)
 
 define Package/rp-l2tpd/install	
-	install -d -m0755 $(1)/etc
+	$(INSTALL_DIR) $(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/
-endef
-
-define Package/rp-l2tpd-mod-cmd/install	
-	install -d -m0755 $(1)/usr/lib/l2tp
+	$(INSTALL_DIR) $(1)/usr/lib/l2tp
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/l2tpd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/cmd.so $(1)/usr/lib/l2tp/
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/
-endef
-
-define Package/rp-l2tpd-mod-ppp/install
-	install -d -m0755 $(1)/usr/lib/l2tp
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/sync-pppd.so $(1)/usr/lib/l2tp/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,rp-l2tpd))
-$(eval $(call BuildPackage,rp-l2tpd-mod-cmd))
-$(eval $(call BuildPackage,rp-l2tpd-mod-ppp))
+#define Package/rp-l2tpd-mod-cmd/install	
+#	$(INSTALL_DIR) $(1)/usr/lib/l2tp
+#	$(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/cmd.so $(1)/usr/lib/l2tp/
+#	$(INSTALL_DIR) $(1)/usr/sbin
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/
+#endef
 
+#define Package/rp-l2tpd-mod-ppp/install
+#	$(INSTALL_DIR) $(1)/usr/lib/l2tp
+#	$(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/sync-pppd.so $(1)/usr/lib/l2tp/
+#endef
 
+$(eval $(call BuildPackage,rp-l2tpd))
+#$(eval $(call BuildPackage,rp-l2tpd-mod-cmd))
+#$(eval $(call BuildPackage,rp-l2tpd-mod-ppp))