]>
Commit | Line | Data |
---|---|---|
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 | |
3 | +++ capi4k-utils/capi20/Makefile.in 2004-12-22 20:44:32.481754152 +0100 | |
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 $@ | |
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) | |
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,8 @@ | |
38 | # as published by the Free Software Foundation; either version | |
39 | # 2 of the License, or (at your option) any later version. | |
40 | ||
41 | +include ../../.config | |
42 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
43 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
44 | ||
45 | include $(TOPDIR)/Rules.make | |
46 | ||
47 | diff -Naur capi4k-utils.orig/pppdcapiplugin/Rules.make capi4k-utils/pppdcapiplugin/Rules.make | |
48 | --- capi4k-utils.orig/pppdcapiplugin/Rules.make 2004-12-21 17:45:25.000000000 +0100 | |
49 | +++ capi4k-utils/pppdcapiplugin/Rules.make 2004-12-22 20:44:32.481754152 +0100 | |
50 | @@ -21,7 +21,7 @@ | |
51 | all: $(ALL) | |
52 | ||
53 | capiplugin.so: capiplugin.o capiconn.o | |
54 | - $(CC) -o $@ $(LDFLAGS) capiplugin.o capiconn.o -lcapi20dyn | |
55 | + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) capiplugin.o capiconn.o -lcapi20dyn | |
56 | ||
57 | userpass.so: userpass.o | |
58 | $(CC) -o $@ $(LDFLAGS) $(CFLAGS) -nostdlib userpass.o | |
59 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/Makefile.template ./pppdcapiplugin/Makefile.template | |
60 | --- ../capi4k-utils.orig/pppdcapiplugin/Makefile.template 2001-05-01 14:43:49.000000000 +0200 | |
61 | +++ ./pppdcapiplugin/Makefile.template 2011-02-19 22:45:36.613077158 +0100 | |
62 | @@ -8,7 +8,8 @@ | |
63 | # as published by the Free Software Foundation; either version | |
64 | # 2 of the License, or (at your option) any later version. | |
65 | ||
66 | +include ../.config | |
67 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
68 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
69 | ||
70 | include $(TOPDIR)/Rules.make | |
71 | ||
72 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile ./pppdcapiplugin/ppp-2.3.11/Makefile | |
73 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile 2001-05-01 14:43:49.000000000 +0200 | |
74 | +++ ./pppdcapiplugin/ppp-2.3.11/Makefile 2011-02-19 22:45:36.609744073 +0100 | |
75 | @@ -8,7 +8,8 @@ | |
76 | # as published by the Free Software Foundation; either version | |
77 | # 2 of the License, or (at your option) any later version. | |
78 | ||
79 | +include ../../.config | |
80 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
81 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
82 | ||
83 | include $(TOPDIR)/Rules.make | |
84 | ||
85 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile ./pppdcapiplugin/ppp-2.4.0/Makefile | |
86 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile 2001-05-01 14:43:50.000000000 +0200 | |
87 | +++ ./pppdcapiplugin/ppp-2.4.0/Makefile 2011-02-19 22:45:36.616410243 +0100 | |
88 | @@ -8,7 +8,8 @@ | |
89 | # as published by the Free Software Foundation; either version | |
90 | # 2 of the License, or (at your option) any later version. | |
91 | ||
92 | +include ../../.config | |
93 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
94 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
95 | ||
96 | include $(TOPDIR)/Rules.make | |
97 | ||
98 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile ./pppdcapiplugin/ppp-2.4.1/Makefile | |
99 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile 2001-05-01 14:43:50.000000000 +0200 | |
100 | +++ ./pppdcapiplugin/ppp-2.4.1/Makefile 2011-02-19 22:45:36.619743328 +0100 | |
101 | @@ -8,7 +8,8 @@ | |
102 | # as published by the Free Software Foundation; either version | |
103 | # 2 of the License, or (at your option) any later version. | |
104 | ||
105 | +include ../../.config | |
106 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
107 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
108 | ||
109 | include $(TOPDIR)/Rules.make | |
110 | ||
111 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile ./pppdcapiplugin/ppp-2.4.1b1/Makefile | |
112 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile 2001-05-01 14:43:51.000000000 +0200 | |
113 | +++ ./pppdcapiplugin/ppp-2.4.1b1/Makefile 2011-02-19 22:45:36.623076413 +0100 | |
114 | @@ -8,7 +8,8 @@ | |
115 | # as published by the Free Software Foundation; either version | |
116 | # 2 of the License, or (at your option) any later version. | |
117 | ||
118 | +include ../../.config | |
119 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
120 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
121 | ||
122 | include $(TOPDIR)/Rules.make | |
123 | ||
124 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile ./pppdcapiplugin/ppp-2.4.1b2/Makefile | |
125 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile 2001-05-01 14:43:52.000000000 +0200 | |
126 | +++ ./pppdcapiplugin/ppp-2.4.1b2/Makefile 2011-02-19 22:45:36.626409498 +0100 | |
127 | @@ -8,7 +8,8 @@ | |
128 | # as published by the Free Software Foundation; either version | |
129 | # 2 of the License, or (at your option) any later version. | |
130 | ||
131 | +include ../../.config | |
132 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
133 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
134 | ||
135 | include $(TOPDIR)/Rules.make | |
136 | ||
137 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile ./pppdcapiplugin/ppp-2.4.2b3/Makefile | |
138 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile 2003-05-18 22:11:15.000000000 +0200 | |
139 | +++ ./pppdcapiplugin/ppp-2.4.2b3/Makefile 2011-02-19 22:45:36.586412480 +0100 | |
140 | @@ -8,7 +8,8 @@ | |
141 | # as published by the Free Software Foundation; either version | |
142 | # 2 of the License, or (at your option) any later version. | |
143 | ||
144 | +include ../../.config | |
145 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
146 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
147 | ||
148 | include $(TOPDIR)/Rules.make | |
149 | ||
150 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile ./pppdcapiplugin/ppp-2.4.3/Makefile | |
151 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile 2004-12-13 23:05:14.000000000 +0100 | |
152 | +++ ./pppdcapiplugin/ppp-2.4.3/Makefile 2011-02-19 22:45:36.626409498 +0100 | |
153 | @@ -8,7 +8,8 @@ | |
154 | # as published by the Free Software Foundation; either version | |
155 | # 2 of the License, or (at your option) any later version. | |
156 | ||
157 | +include ../../.config | |
158 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
159 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
160 | ||
161 | include $(TOPDIR)/Rules.make | |
162 | ||
163 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile ./pppdcapiplugin/ppp-2.4.4/Makefile | |
164 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile 2011-02-19 22:45:02.235639872 +0100 | |
165 | +++ ./pppdcapiplugin/ppp-2.4.4/Makefile 2011-02-19 22:45:36.629742583 +0100 | |
166 | @@ -8,7 +8,8 @@ | |
167 | # as published by the Free Software Foundation; either version | |
168 | # 2 of the License, or (at your option) any later version. | |
169 | ||
170 | +include ../../.config | |
171 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
172 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
173 | ||
174 | include $(TOPDIR)/Rules.make | |
175 | ||
176 | diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile ./pppdcapiplugin/ppp-2.4.5/Makefile | |
177 | --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile 2011-02-19 22:45:02.242306040 +0100 | |
178 | +++ ./pppdcapiplugin/ppp-2.4.5/Makefile 2011-02-19 22:45:36.633075668 +0100 | |
179 | @@ -8,7 +8,8 @@ | |
180 | # as published by the Free Software Foundation; either version | |
181 | # 2 of the License, or (at your option) any later version. | |
182 | ||
183 | +include ../../.config | |
184 | -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) | |
185 | +PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION) | |
186 | ||
187 | include $(TOPDIR)/Rules.make | |
188 |