]>
Commit | Line | Data |
---|---|---|
5f4efafa | 1 | diff -Naur capi4k-utils.orig/capi20/Makefile.in capi4k-utils/capi20/Makefile.in |
2 | --- capi4k-utils.orig/capi20/Makefile.in 2004-12-21 17:45:25.000000000 +0100 | |
4c8e5909 | 3 | +++ capi4k-utils/capi20/Makefile.in 2004-12-22 20:44:32.481754152 +0100 |
33d4af14 | 4 | @@ -118,7 +118,7 @@ |
5 | libcapi20_la_LIBADD = | |
6 | libcapi20_la_OBJECTS = capi20.lo capifunc.lo convert.lo | |
7 | CFLAGS = @CFLAGS@ | |
8 | -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
9 | +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC | |
10 | LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
11 | CCLD = $(CC) | |
12 | LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ | |
5f4efafa | 13 | @@ -261,7 +261,7 @@ |
14 | done | |
15 | ||
16 | libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES) | |
17 | - $(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS) | |
18 | + $(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_CFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS) | |
19 | ||
20 | install-includeHEADERS: $(include_HEADERS) | |
21 | @$(NORMAL_INSTALL) | |
4c8e5909 | 22 | diff -Naur capi4k-utils.orig/Makefile capi4k-utils/Makefile |
23 | --- capi4k-utils.orig/Makefile 2004-12-21 17:45:25.000000000 +0100 | |
24 | +++ capi4k-utils/Makefile 2004-12-22 20:44:47.104531152 +0100 | |
25 | @@ -121,7 +121,7 @@ | |
26 | @set -e; for i in `echo $(SUBDIRS)`; do \ | |
27 | if [ -x $$i/configure ] ; then \ | |
28 | echo -e "\nRunning configure in $$i ...\n"; sleep 1; \ | |
29 | - (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \ | |
30 | + (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --libdir=$(CONFIG_LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \ | |
31 | elif [ -f $$i/Makefile.in ] ; then \ | |
32 | echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \ | |
33 | $(MAKE) -C $$i -f Makefile.in config; \ | |
34 | diff -Naur capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile | |
35 | --- capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile 2004-12-21 17:45:25.000000000 +0100 | |
36 | +++ capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile 2004-12-22 20:44:47.104531152 +0100 | |
37 | @@ -8,7 +8,7 @@ | |
38 | # as published by the Free Software Foundation; either version | |
39 | # 2 of the License, or (at your option) any later version. | |
40 | ||
41 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
42 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
43 | ||
44 | include $(TOPDIR)/Rules.make | |
45 | ||
6345ca96 | 46 | diff -Naur capi4k-utils.orig/pppdcapiplugin/Rules.make capi4k-utils/pppdcapiplugin/Rules.make |
5f4efafa | 47 | --- capi4k-utils.orig/pppdcapiplugin/Rules.make 2004-12-21 17:45:25.000000000 +0100 |
4c8e5909 | 48 | +++ capi4k-utils/pppdcapiplugin/Rules.make 2004-12-22 20:44:32.481754152 +0100 |
6345ca96 | 49 | @@ -21,7 +21,7 @@ |
50 | all: $(ALL) | |
51 | ||
52 | capiplugin.so: capiplugin.o capiconn.o | |
53 | - $(CC) -o $@ $(LDFLAGS) capiplugin.o capiconn.o -lcapi20dyn | |
54 | + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) capiplugin.o capiconn.o -lcapi20dyn | |
55 | ||
56 | userpass.so: userpass.o | |
57 | $(CC) -o $@ $(LDFLAGS) $(CFLAGS) -nostdlib userpass.o | |
b0ded9b5 KK |
58 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/Makefile.template ./pppdcapiplugin/Makefile.template |
59 | --- ../capi4k-utils.orig/pppdcapiplugin/Makefile.template 2001-05-01 14:43:49.000000000 +0200 | |
60 | +++ ./pppdcapiplugin/Makefile.template 2011-02-19 22:45:36.613077158 +0100 | |
61 | @@ -8,7 +8,7 @@ | |
62 | # as published by the Free Software Foundation; either version | |
63 | # 2 of the License, or (at your option) any later version. | |
64 | ||
65 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
66 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
67 | ||
68 | include $(TOPDIR)/Rules.make | |
69 | ||
70 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile ./pppdcapiplugin/ppp-2.3.11/Makefile | |
71 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile 2001-05-01 14:43:49.000000000 +0200 | |
72 | +++ ./pppdcapiplugin/ppp-2.3.11/Makefile 2011-02-19 22:45:36.609744073 +0100 | |
73 | @@ -8,7 +8,7 @@ | |
74 | # as published by the Free Software Foundation; either version | |
75 | # 2 of the License, or (at your option) any later version. | |
76 | ||
77 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
78 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
79 | ||
80 | include $(TOPDIR)/Rules.make | |
81 | ||
82 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile ./pppdcapiplugin/ppp-2.4.0/Makefile | |
83 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile 2001-05-01 14:43:50.000000000 +0200 | |
84 | +++ ./pppdcapiplugin/ppp-2.4.0/Makefile 2011-02-19 22:45:36.616410243 +0100 | |
85 | @@ -8,7 +8,7 @@ | |
86 | # as published by the Free Software Foundation; either version | |
87 | # 2 of the License, or (at your option) any later version. | |
88 | ||
89 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
90 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
91 | ||
92 | include $(TOPDIR)/Rules.make | |
93 | ||
94 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile ./pppdcapiplugin/ppp-2.4.1/Makefile | |
95 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile 2001-05-01 14:43:50.000000000 +0200 | |
96 | +++ ./pppdcapiplugin/ppp-2.4.1/Makefile 2011-02-19 22:45:36.619743328 +0100 | |
97 | @@ -8,7 +8,7 @@ | |
98 | # as published by the Free Software Foundation; either version | |
99 | # 2 of the License, or (at your option) any later version. | |
100 | ||
101 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
102 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
103 | ||
104 | include $(TOPDIR)/Rules.make | |
105 | ||
106 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile ./pppdcapiplugin/ppp-2.4.1b1/Makefile | |
107 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile 2001-05-01 14:43:51.000000000 +0200 | |
108 | +++ ./pppdcapiplugin/ppp-2.4.1b1/Makefile 2011-02-19 22:45:36.623076413 +0100 | |
109 | @@ -8,7 +8,7 @@ | |
110 | # as published by the Free Software Foundation; either version | |
111 | # 2 of the License, or (at your option) any later version. | |
112 | ||
113 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
114 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
115 | ||
116 | include $(TOPDIR)/Rules.make | |
117 | ||
118 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile ./pppdcapiplugin/ppp-2.4.1b2/Makefile | |
119 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile 2001-05-01 14:43:52.000000000 +0200 | |
120 | +++ ./pppdcapiplugin/ppp-2.4.1b2/Makefile 2011-02-19 22:45:36.626409498 +0100 | |
121 | @@ -8,7 +8,7 @@ | |
122 | # as published by the Free Software Foundation; either version | |
123 | # 2 of the License, or (at your option) any later version. | |
124 | ||
125 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
126 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
127 | ||
128 | include $(TOPDIR)/Rules.make | |
129 | ||
130 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile ./pppdcapiplugin/ppp-2.4.2b3/Makefile | |
131 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile 2003-05-18 22:11:15.000000000 +0200 | |
132 | +++ ./pppdcapiplugin/ppp-2.4.2b3/Makefile 2011-02-19 22:45:36.586412480 +0100 | |
133 | @@ -8,7 +8,7 @@ | |
134 | # as published by the Free Software Foundation; either version | |
135 | # 2 of the License, or (at your option) any later version. | |
136 | ||
137 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
138 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
139 | ||
140 | include $(TOPDIR)/Rules.make | |
141 | ||
142 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile ./pppdcapiplugin/ppp-2.4.3/Makefile | |
143 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile 2004-12-13 23:05:14.000000000 +0100 | |
144 | +++ ./pppdcapiplugin/ppp-2.4.3/Makefile 2011-02-19 22:45:36.626409498 +0100 | |
145 | @@ -8,7 +8,7 @@ | |
146 | # as published by the Free Software Foundation; either version | |
147 | # 2 of the License, or (at your option) any later version. | |
148 | ||
149 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
150 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
151 | ||
152 | include $(TOPDIR)/Rules.make | |
153 | ||
154 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile ./pppdcapiplugin/ppp-2.4.4/Makefile | |
155 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile 2011-02-19 22:45:02.235639872 +0100 | |
156 | +++ ./pppdcapiplugin/ppp-2.4.4/Makefile 2011-02-19 22:45:36.629742583 +0100 | |
157 | @@ -8,7 +8,7 @@ | |
158 | # as published by the Free Software Foundation; either version | |
159 | # 2 of the License, or (at your option) any later version. | |
160 | ||
161 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
162 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
163 | ||
164 | include $(TOPDIR)/Rules.make | |
165 | ||
166 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile ./pppdcapiplugin/ppp-2.4.5/Makefile | |
167 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile 2011-02-19 22:45:02.242306040 +0100 | |
168 | +++ ./pppdcapiplugin/ppp-2.4.5/Makefile 2011-02-19 22:45:36.633075668 +0100 | |
169 | @@ -8,7 +8,7 @@ | |
170 | # as published by the Free Software Foundation; either version | |
171 | # 2 of the License, or (at your option) any later version. | |
172 | ||
173 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
174 | +PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION) | |
175 | ||
176 | include $(TOPDIR)/Rules.make | |
177 |