fix ppp related bug in the network scripts

[openwrt.git] / package / ppp / Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index dcacbaf..64351a5 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -28,6 +28,7 @@ SECTION:=net
 CATEGORY:=Network
 MENU:=1
 DEFAULT:=y
+DEPENDS:=+kmod-ppp
 TITLE:=PPP daemon
 DESCRIPTION:=PPP (Point-to-Point Protocol) daemon
 URL:=http://ppp.samba.org/
@@ -36,7 +37,7 @@ endef
 define Package/ppp-mod-pppoa
 SECTION:=net
 CATEGORY:=Network
-DEPENDS:=ppp +linux-atm
+DEPENDS:=ppp +linux-atm +kmod-pppoa
 TITLE:=PPPoA plugin
 DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp
 endef
@@ -45,7 +46,7 @@ define Package/ppp-mod-pppoe
 SECTION:=net
 CATEGORY:=Network
 DEFAULT:=y
-DEPENDS:=ppp
+DEPENDS:=ppp +kmod-pppoe
 TITLE:=PPPoE plugin
 DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp
 endef
@@ -86,7 +87,7 @@ define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)/usr
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) \
+               $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
                PRECOMPILED_FILTER=1 \
                STAGING_DIR="$(STAGING_DIR)" \
@@ -95,6 +96,8 @@ define Build/Compile
 endef
 
 define Package/ppp/install
+       install -d -m0755 $(1)/lib/network
+       install -m0755 ./files/ppp.sh $(1)/lib/network/
        install -d -m0755 $(1)/etc/ppp
        install -m0600 ./files/etc/ppp/chap-secrets $(1)/etc/ppp/
        install -m0644 ./files/etc/ppp/filter $(1)/etc/ppp/
@@ -110,19 +113,19 @@ define Package/ppp/install
 endef
        
 define Package/ppp-mod-pppoa/install
+       install -d -m0755 $(1)/lib/network
+       install -m0755 ./files/pppoa.sh $(1)/lib/network/
        install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
        install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
-       install -d -m0755 $(1)/sbin
-       install -m0755 ./files/ifup.pppoa $(1)/sbin/
 endef
 
 define Package/ppp-mod-pppoe/install
+       install -d -m0755 $(1)/lib/network
+       install -m0755 ./files/pppoe.sh $(1)/lib/network/
        install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
        install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
                $(1)/usr/lib/pppd/$(PKG_VERSION)/
-       install -d -m0755 $(1)/sbin
-       install -m0755 ./files/ifup.pppoe $(1)/sbin/
 endef
 
 define Package/ppp-mod-radius/install
@@ -151,7 +154,6 @@ endef
 define Package/pppstats/install
        install -d -m0755 $(1)/usr/sbin
        install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(1)/usr/sbin/
-       $(RSTRIP) $(1)
 endef
 
 $(eval $(call BuildPackage,ppp))