1 --- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200
2 +++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2006-07-24 20:44:56.000000000 +0200
5 DESTDIR = $(INSTROOT)@DESTDIR@
6 BINDIR = $(DESTDIR)/sbin
7 -LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
8 +LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
10 PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
12 --- ppp-2.4.4/pppd/plugins/radius/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200
13 +++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2006-07-24 20:44:45.000000000 +0200
16 DESTDIR = $(INSTROOT)@DESTDIR@
17 MANDIR = $(DESTDIR)/share/man/man8
18 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
19 +LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
21 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
23 --- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64 2004-11-14 02:12:10.000000000 +0100
24 +++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2006-07-24 20:44:29.000000000 +0200
27 #***********************************************************************
29 -DESTDIR = $(INSTROOT)@DESTDIR@
30 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
31 +DESTDIR = $(INSTROOT)@DESTDIR@
32 +LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
34 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
36 --- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200
37 +++ ppp-2.4.4/pppd/plugins/Makefile.linux 2006-07-24 20:43:40.000000000 +0200
39 DESTDIR = $(INSTROOT)@DESTDIR@
40 BINDIR = $(DESTDIR)/sbin
41 MANDIR = $(DESTDIR)/share/man/man8
42 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
43 +LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
45 SUBDIRS := rp-pppoe pppoatm pppol2tp
46 # Uncomment the next line to include the radius authentication plugin
47 --- ppp-2.4.4/pppd/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200
48 +++ ppp-2.4.4/pppd/Makefile.linux 2006-07-24 20:43:40.000000000 +0200
50 BINDIR = $(DESTDIR)/sbin
51 MANDIR = $(DESTDIR)/share/man/man8
52 INCDIR = $(DESTDIR)/include
53 +LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
61 -COPTS = -Wall $(RPM_OPT_FLAGS)
62 +COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
65 # Uncomment the next 2 lines to include support for Microsoft's
66 --- ppp-2.4.4/pppd/pathnames.h.lib64 2005-08-26 01:59:34.000000000 +0200
67 +++ ppp-2.4.4/pppd/pathnames.h 2006-07-24 20:43:40.000000000 +0200
72 -#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION
73 +#define _PATH_PLUGIN LIBDIR "/pppd/" VERSION
75 #define _PATH_PLUGIN "/usr/lib/pppd"
77 --- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.lib64 2009-11-16 23:26:07.000000000 +0100
78 +++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2010-08-05 16:33:53.964898629 +0200
81 #***********************************************************************
84 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
85 +DESTDIR = $(INSTROOT)@DESTDIR@
86 +LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
88 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)