- fixed scripts (was stoppng service on upgrade), STBR
[packages/capi4k-utils.git] / capi4k-utils-amd64.patch
CommitLineData
5f4efafa 1diff -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 22diff -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; \
34diff -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 46diff -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
This page took 0.032157 seconds and 4 git commands to generate.