X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fpptpd%2FMakefile;h=0e5bb127f58179e3cc19070b92aa6eab9901ee57;hp=176650997875d53385c5481be9f82947d396a712;hb=18b2c8c7d396a6b8569ba1c9c19efc2f1d75da82;hpb=6ab91ff673581f10aae3ab44c04ee93384358621

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
old mode 100755
new mode 100644
index 1766509978..0e5bb127f5
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -26,49 +26,23 @@ include $(INCLUDE_DIR)/package.mk
 define Package/pptpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=
+  DEPENDS:=+kmod-ppp +kmod-gre
   TITLE:=PopTop pptp server
   DESCRIPTION:=PopTop pptp server
 endef
 
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
-		  --with-pppd-ip-alloc \
-	)
+$(call Build/Configure/Default, --with-bcrelay)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
+  $(call Build/Compile/Default, \
 		CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install" \
-		all install
+		all install \
+  )
 endef
 
 define Package/pptpd/install
@@ -80,14 +54,11 @@ define Package/pptpd/install
 	install -m0644 ./files/options.pptpd $(1)/etc/ppp/
 	install -d -m0755 $(1)/usr/sbin
 	install -d -m0755 $(1)/usr/lib/pptpd
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd
 	$(STRIP) $1/usr/sbin/*
 	$(STRIP) $1/usr/lib/pptpd/*
 endef
 
 $(eval $(call BuildPackage,pptpd))
-
-
-