add common functions for the new config file format

[openwrt.git] / openwrt / package / pptpd / Makefile

diff --git a/openwrt/package/pptpd/Makefile b/openwrt/package/pptpd/Makefile
index 5880799..34d2229 100644 (file)
--- a/openwrt/package/pptpd/Makefile
+++ b/openwrt/package/pptpd/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd

-PKG_VERSION:=1.2.3
-PKG_RELEASE:=1
-PKG_MD5SUM:=a521e40ca304b0c125cc25f9b9d03324
+PKG_VERSION:=1.3.0
+PKG_RELEASE:=2
+PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67

 
 PKG_SOURCE_URL:=@SF/poptop
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=@SF/poptop
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -44,7 +44,7 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_NLS) \
                  --with-pppd-ip-alloc \
        )
                  $(DISABLE_NLS) \
                  --with-pppd-ip-alloc \
        )

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -53,17 +53,17 @@ $(PKG_BUILD_DIR)/.built:
                DESTDIR="$(PKG_INSTALL_DIR)" \
                INSTALL="install" \
                all install
                DESTDIR="$(PKG_INSTALL_DIR)" \
                INSTALL="install" \
                all install

-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

 
 $(IPKG_PPTPD):
        install -d -m0755 $(IDIR_PPTPD)/etc
        install -m0644 ./files/pptpd.conf $(IDIR_PPTPD)/etc/
        install -d -m0755 $(IDIR_PPTPD)/etc/init.d
 
 $(IPKG_PPTPD):
        install -d -m0755 $(IDIR_PPTPD)/etc
        install -m0644 ./files/pptpd.conf $(IDIR_PPTPD)/etc/
        install -d -m0755 $(IDIR_PPTPD)/etc/init.d

-       install -m0644 ./files/pptpd.init $(IDIR_PPTPD)/etc/init.d/pptpd
+       install -m0755 ./files/pptpd.init $(IDIR_PPTPD)/etc/init.d/pptpd

        install -d -m0755 $(IDIR_PPTPD)/etc/ppp
        install -m0644 ./files/options.pptpd $(IDIR_PPTPD)/etc/ppp/
        install -d -m0755 $(IDIR_PPTPD)/usr/sbin
        install -d -m0755 $(IDIR_PPTPD)/etc/ppp
        install -m0644 ./files/options.pptpd $(IDIR_PPTPD)/etc/ppp/
        install -d -m0755 $(IDIR_PPTPD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/

        $(RSTRIP) $(IDIR_PPTPD)
        $(IPKG_BUILD) $(IDIR_PPTPD) $(PACKAGE_DIR)
        $(RSTRIP) $(IDIR_PPTPD)
        $(IPKG_BUILD) $(IDIR_PPTPD) $(PACKAGE_DIR)