1 files changed, 12 insertions, 15 deletions
diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
index 481f1e41c..e3d743e6f 100644
--- a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
@@ -1,18 +1,20 @@
---- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2011-01-21 21:30:05.208658673 +0100
-@@ -1,29 +1,27 @@
+--- ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux	2014-06-06 08:18:13.000000000 +0200
+@@ -1,22 +1,20 @@
 -#CC	= gcc
 -COPTS	= -O2 -g
 -CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
 -LDFLAGS	= -shared
 -INSTALL	= install
-+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- 
+-
 -#***********************************************************************
-+include ../../../Makedefs.com
- 
+-
 -DESTDIR = @DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+-
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
++include ../../../Makedefs.com
 +CPPFLAGS += -I. -I../.. -I../../../include
 +ifeq (,$(filter -fPIC,$(CFLAGS)))
 +CFLAGS += -fPIC
@@ -20,10 +22,7 @@
 +ifeq (,$(filter -shared,$(LDFLAGS)))
 +LDFLAGS += -shared
 +endif
- 
--VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-+#***********************************************************************
- 
++
  PLUGINS := pppol2tp.so openl2tp.so
  
  all: $(PLUGINS)
@@ -32,11 +31,9 @@
 -	$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
--install: all
-+install: $(PLUGINS)
+ install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR)
-+	$(INSTALL) $(STRIP) -c -m 755 $(PLUGINS) $(LIBDIR)
+@@ -24,6 +22,3 @@ install: all
  
  clean:
  	rm -f *.o *.so