X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fpptpd%2FMakefile;h=bd6b56eed3683b640e18bc36e701af9c9921b75f;hb=e2c23368b17e54c44479ccccd426a2156d5de03b;hp=dc57921755f66fa96aafa4fe18de38d47056f0a0;hpb=5cb332fb355cda50c0cfc952cee0778e5148781c;p=packages.git

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index dc5792175..bd6b56eed 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/poptop
 PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -28,6 +27,7 @@ define Package/pptpd
   DEPENDS:=+kmod-ppp +kmod-gre
   TITLE:=PopTop pptp server
   URL:=http://www.poptop.org/
+  SUBMENU:=vpn
 endef
 
 define Build/Configure
@@ -38,7 +38,7 @@ endef
 
 define Build/Compile
 	$(call Build/Compile/Default, \
-		COPTS="\$$$$(EXTRA_CFLAGS)" \
+		COPTS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install" \
 		all install \
@@ -46,17 +46,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))