/[smeserver]/rpms/ppp/sme7/ppp-2.4.4-lib64.patch
ViewVC logotype

Contents of /rpms/ppp/sme7/ppp-2.4.4-lib64.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Tue Jun 12 17:08:31 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: ppp-2_4_4-1_3_el4_sme, HEAD
Import on branch sme7 of package ppp-2.4.4-1.3.el4.sme.src.rpm

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 = @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
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__ */

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed