add a lot of debian fixes to ppp (should fix persist and demand, too), clean up patches

[openwrt.git] / package / ppp / Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 1da9715..4314632 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.3
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.3

-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
 
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
 
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/


@@ -62,7 +62,7 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        )
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        )

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

 
 $(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
 
 $(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)


@@ -70,9 +70,10 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC=$(TARGET_CC) \
                COPTS="$(TARGET_CFLAGS)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC=$(TARGET_CC) \
                COPTS="$(TARGET_CFLAGS)" \

+               HAVE_INET6="1" \

                DESTDIR="$(PKG_INSTALL_DIR)/usr" \
                all install
                DESTDIR="$(PKG_INSTALL_DIR)/usr" \
                all install

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

 
 $(IPKG_PPP):
        install -d -m0755 $(IDIR_PPP)/etc/ppp
 
 $(IPKG_PPP):
        install -d -m0755 $(IDIR_PPP)/etc/ppp


@@ -88,8 +89,8 @@ $(IPKG_PPP):
        $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
        
 $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe:
        $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
        
 $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe:

-       install -d -m0755 $(IDIR_PPP_MOD_PPPOE)/etc/init.d
-       install -m0755 ./files/pppoe.init $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe
+       install -d -m0755 $(IDIR_PPP_MOD_PPPOE)/sbin
+       install -m0755 ./files/ifup.pppoe $(IDIR_PPP_MOD_PPPOE)/sbin/

 
 $(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe
 
 
 $(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe