]> git.ipfire.org Git - ipfire-3.x.git/blame - ppp/patches/ppp-2.4.4-lib64.patch
projects / ipfire-3.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Move all packages to root.
[ipfire-3.x.git] / ppp / patches / ppp-2.4.4-lib64.patch
CommitLineData
0bc5d371
MT		 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
3@@ -15,7 +15,7 @@
4
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)
9
10 PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
11
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
14@@ -5,7 +5,7 @@
15
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)
20
21 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
22
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
25@@ -6,8 +6,8 @@
26
27 #***********************************************************************
28
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)
33
34 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
35
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
38@@ -7,7 +7,7 @@
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)
44
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
49@@ -8,6 +8,7 @@
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)
54
55 TARGETS = pppd
56
57@@ -32,7 +33,7 @@
58
59 CC = gcc
60 #
61-COPTS = -Wall $(RPM_OPT_FLAGS)
62+COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
63 LIBS = -lutil
64
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
68@@ -57,7 +57,7 @@
69
70 #ifdef PLUGIN
71 #ifdef __STDC__
72-#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION
73+#define _PATH_PLUGIN LIBDIR "/pppd/" VERSION
74 #else /* __STDC__ */
75 #define _PATH_PLUGIN "/usr/lib/pppd"
76 #endif /* __STDC__ */
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
79@@ -6,8 +6,8 @@
80
81 #***********************************************************************
82
83-DESTDIR = @DESTDIR@
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)
87
88 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
89
IPFire 3.x development tree