X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fpptpd%2FMakefile;h=d57241bfa1ebb6b27c2944732f2e083fa51e0a1e;hb=23487d9434797944e0ad11214357049fdd726837;hp=148a2be4fc65ed34f8071ef2a88e2ebc908dc06b;hpb=1256219045214a49be6d2a8360487940cedf0246;p=packages.git

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index 148a2be4f..d57241bfa 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -11,14 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=pptpd
 PKG_VERSION:=1.3.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67
 
-PKG_SOURCE_URL:=@SF/poptop
 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/poptop
+PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,15 +23,19 @@ define Package/pptpd
   CATEGORY:=Network
   DEPENDS:=+kmod-ppp +kmod-gre
   TITLE:=PopTop pptp server
+  URL:=http://www.poptop.org/
+  SUBMENU:=VPN
 endef
 
 define Build/Configure
-	$(call Build/Configure/Default, --with-bcrelay)
+	$(call Build/Configure/Default, \
+		--with-bcrelay \
+	)
 endef
 
 define Build/Compile
 	$(call Build/Compile/Default, \
-		COPTS="\$$$$(EXTRA_CFLAGS)" \
+		COPTS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install" \
 		all install \
@@ -43,17 +43,17 @@ define Build/Compile
 endef
 
 define Package/pptpd/install
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/
-	install -d -m0755 $(1)/usr/lib/pptpd
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/pptpd
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd
-	install -d -m0755 $(1)/etc
-	install -m0644 ./files/pptpd.conf $(1)/etc/
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/pptpd.init $(1)/etc/init.d/pptpd
-	install -d -m0755 $(1)/etc/ppp
-	install -m0644 ./files/options.pptpd $(1)/etc/ppp/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/pptpd.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/pptpd.init $(1)/etc/init.d/pptpd
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_DATA) ./files/options.pptpd $(1)/etc/ppp/
 endef
 
 $(eval $(call BuildPackage,pptpd))