X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/609fbd1a579f41a8cb6d1029aa5eb86477851d89..eb9ff0d90a97b4a9c86689d097f0c5f9c5a6db97:/package/ppp/Makefile

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index dd1dbd220..e42a37a76 100644
--- 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_RELEASE := 3
+PKG_RELEASE := 4
 PKG_MD5SUM := 848f6c3cafeb6074ffeb293c3af79b7c
 
 PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/
@@ -96,7 +96,7 @@ $(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd
 	cp -af ./ipkg/ppp/* $(I_PPP)
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP) control/ppp.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
 	mkdir -p $(I_PPP)/etc/ppp
-	ln -s /tmp/resolv.conf $(I_PPP)/etc/ppp/resolv.conf
+	ln -sf /tmp/resolv.conf $(I_PPP)/etc/ppp/resolv.conf
 	mkdir -p $(I_PPP)/usr/sbin
 	cp -af $(PKG_BUILD_DIR)/pppd/pppd $(I_PPP)/usr/sbin/
 	$(STRIP) $(I_PPP)/usr/sbin/*
@@ -116,10 +116,10 @@ $(IPKG_STATE_DIR)/info/ppp.list: $(PKG_PPP)
 $(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP)
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	cp -af ./ipkg/ppp-pppoe-plugin/* $(I_PPP_PPPOE_PLUGIN)
-	mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
+	mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
 	cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \
-		$(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
-	$(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/*/*.so
+		$(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
+	$(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so
 	mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
 	cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
 	find $(I_PPP_PPPOE_PLUGIN) -name CVS | xargs rm -rf
@@ -130,10 +130,10 @@ $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(PKG_PPP_PPPOE_PLUGIN)
 
 $(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP)
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius
+	mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
 	cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \
-	  $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius/
-	$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so
+	  $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
+	$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so
 	find $(I_PPP_RADIUS_PLUGIN) -name CVS | xargs rm -rf
 	$(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR)