fix rp-pppoe compile

[openwrt/svn-archive/archive.git] / net / rp-pppoe / Makefile

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index a2bebb8c0280fd4800c106c0ef358699a2983407..fa0b2b5fccb00c77b9089552744e1cb2f3f7eb23 100644 (file)
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
-PKG_VERSION:=3.5
+PKG_VERSION:=3.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://roaringpenguin.com/penguin/pppoe/
-PKG_MD5SUM:=97972f8f8f6a3ab9b7070333a6a29c4b
+PKG_SOURCE_URL:=http://roaringpenguin.com/files/download
+PKG_MD5SUM:=0e32760f498f9cde44081ee6aafc823b
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -50,48 +50,43 @@ define Package/rp-pppoe-sniff
   TITLE+= sniffer
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default,,, src)
-endef
-
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR)/src \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/src/libevent
+CONFIGURE_PATH := ./src
+CONFIGURE_ARGS += ac_cv_path_PPPD=/usr/sbin/pppd
+MAKE_FLAGS := RPM_INSTALL_ROOT="$(PKG_INSTALL_DIR)" install
+MAKE_PATH := ./src
 
 define Package/rp-pppoe-client/install 
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/pppoe-client.init $(1)/etc/init.d/pppoe-client
-       install -d -m0755 $(1)/etc/ppp
-       install -m0644 $(PKG_INSTALL_DIR)/etc/pppoe.conf $(1)/etc/
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/pppoe-client.init $(1)/etc/init.d/pppoe-client
+       $(INSTALL_DIR) $(1)/etc/ppp
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe.conf $(1)/etc/ppp/
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/adsl-* $(1)/usr/sbin/
 endef
 
 define Package/rp-pppoe-relay/install  
-       install -d -m0755 $(1)/etc/default
-       install -m0755 ./files/pppoe-relay.default $(1)/etc/default/pppoe-relay
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/pppoe-relay.init $(1)/etc/init.d/pppoe-relay
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/default
+       $(INSTALL_BIN) ./files/pppoe-relay.default $(1)/etc/default/pppoe-relay
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/pppoe-relay.init $(1)/etc/init.d/pppoe-relay
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(1)/usr/sbin/
 endef
 
 define Package/rp-pppoe-server/install 
-       install -d -m0755 $(1)/etc/default
-       install -m0755 ./files/pppoe-server.default $(1)/etc/default/pppoe-server
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/pppoe-server.init $(1)/etc/init.d/pppoe-server
-       install -d -m0755 $(1)/etc/ppp
-       install -m0644 $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/default
+       $(INSTALL_BIN) ./files/pppoe-server.default $(1)/etc/default/pppoe-server
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/pppoe-server.init $(1)/etc/init.d/pppoe-server
+       $(INSTALL_DIR) $(1)/etc/ppp
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/
 endef
 
 define Package/rp-pppoe-sniff/install  
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(1)/usr/sbin/
 endef