diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-02 03:22:51 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-02 03:22:51 +0000 |
commit | 20baa30c3c0e442a770f2906d12784ab7ef719ec (patch) | |
tree | 556ba62fdd6b003ab007c814825e00ed1d3f9e44 /core/ppp/ppp-2.4.6-makefiles.patch | |
parent | e326bc7715fc98496e1c1c7bf8335d93b83f1ffa (diff) |
Sun Mar 2 03:20:04 UTC 2014
Diffstat (limited to 'core/ppp/ppp-2.4.6-makefiles.patch')
-rw-r--r-- | core/ppp/ppp-2.4.6-makefiles.patch | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/core/ppp/ppp-2.4.6-makefiles.patch b/core/ppp/ppp-2.4.6-makefiles.patch index 3e328d8c6..5fc7bccb5 100644 --- a/core/ppp/ppp-2.4.6-makefiles.patch +++ b/core/ppp/ppp-2.4.6-makefiles.patch @@ -1,6 +1,6 @@ diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux --- ppp-2.4.6.orig/chat/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/chat/Makefile.linux 2014-02-21 23:55:33.256988585 +0100 ++++ ppp-2.4.6/chat/Makefile.linux 2014-02-24 09:00:16.666577906 +0100 @@ -1,7 +1,7 @@ # $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $ @@ -31,7 +31,7 @@ diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux mkdir -p $(BINDIR) $(MANDIR) diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure --- ppp-2.4.6.orig/configure 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/configure 2014-02-21 23:56:43.732151365 +0100 ++++ ppp-2.4.6/configure 2014-02-24 09:00:16.743242620 +0100 @@ -185,7 +185,10 @@ rm -f $2 if [ -f $1 ]; then @@ -46,7 +46,7 @@ diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top --- ppp-2.4.6.orig/linux/Makefile.top 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/linux/Makefile.top 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/linux/Makefile.top 2014-02-24 09:00:16.743242620 +0100 @@ -1,7 +1,7 @@ # PPP top-level Makefile for Linux. @@ -58,7 +58,7 @@ diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top ETCDIR = $(INSTROOT)@SYSCONF@/ppp diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux --- ppp-2.4.6.orig/pppd/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/Makefile.linux 2014-02-24 09:00:16.743242620 +0100 @@ -5,7 +5,7 @@ # Default installation locations @@ -80,7 +80,7 @@ diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux # Uncomment the next 2 lines to include support for Microsoft's diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/Makefile.linux 2014-02-24 09:00:16.779908379 +0100 @@ -1,11 +1,11 @@ #CC = gcc -COPTS = -O2 -g @@ -98,7 +98,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Make diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -1,7 +1,7 @@ #CC = gcc -COPTS = -O2 -g @@ -120,8 +120,8 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plug $(INSTALL) -d -m 755 $(LIBDIR) diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux --- 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-02-21 23:55:33.336986730 +0100 -@@ -1,7 +1,7 @@ ++++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux 2014-02-24 09:01:06.325349425 +0100 +@@ -1,12 +1,12 @@ #CC = gcc -COPTS = -O2 -g +COPTS = @CFLAGS@ @@ -131,6 +131,12 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plu INSTALL = install #*********************************************************************** + +-DESTDIR = @DESTDIR@ ++DESTDIR = $(INSTROOT)@DESTDIR@ + LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) @@ -16,7 +16,7 @@ all: $(PLUGINS) @@ -142,7 +148,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plu $(INSTALL) -d -m 755 $(LIBDIR) diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugins/radius/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -12,7 +12,8 @@ INSTALL = install @@ -172,7 +178,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugi clientid.o sendserver.o lock.o util.o md5.o diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -15,7 +15,7 @@ #*********************************************************************** @@ -210,7 +216,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plu $(INSTALL) -d -m 755 $(LIBDIR) diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux --- ppp-2.4.6.orig/pppdump/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppdump/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppdump/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -1,8 +1,9 @@ DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin @@ -234,7 +240,7 @@ diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux rm -f pppdump $(OBJS) *~ diff -Nur ppp-2.4.6.orig/pppstats/Makefile.linux ppp-2.4.6/pppstats/Makefile.linux --- ppp-2.4.6.orig/pppstats/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppstats/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppstats/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -3,14 +3,15 @@ # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $ # |