X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcapi4k-utils.git;a=blobdiff_plain;f=capi4k-utils-amd64.patch;h=ea1493c8adee97e3cb5405e4a84ea8d1f299b91f;hp=b20c3e013d9d12ad5dec893ee1679cba29880dc9;hb=416bb05dc535c445ced3ea6c2036bf5c49bb195b;hpb=5f4efafaa87cef7ee19e9d417b4b74e8a2de6e6b

diff --git a/capi4k-utils-amd64.patch b/capi4k-utils-amd64.patch
index b20c3e0..ea1493c 100644
--- a/capi4k-utils-amd64.patch
+++ b/capi4k-utils-amd64.patch
@@ -1,6 +1,15 @@
 diff -Naur capi4k-utils.orig/capi20/Makefile.in capi4k-utils/capi20/Makefile.in
 --- capi4k-utils.orig/capi20/Makefile.in	2004-12-21 17:45:25.000000000 +0100
-+++ capi4k-utils/capi20/Makefile.in	2004-12-22 13:59:04.847116768 +0100
++++ capi4k-utils/capi20/Makefile.in	2004-12-22 20:44:32.481754152 +0100
+@@ -118,7 +118,7 @@
+ libcapi20_la_LIBADD = 
+ libcapi20_la_OBJECTS =  capi20.lo capifunc.lo convert.lo
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 @@ -261,7 +261,7 @@
  	done
  
@@ -10,9 +19,33 @@ diff -Naur capi4k-utils.orig/capi20/Makefile.in capi4k-utils/capi20/Makefile.in
  
  install-includeHEADERS: $(include_HEADERS)
  	@$(NORMAL_INSTALL)
+diff -Naur capi4k-utils.orig/Makefile capi4k-utils/Makefile
+--- capi4k-utils.orig/Makefile	2004-12-21 17:45:25.000000000 +0100
++++ capi4k-utils/Makefile	2004-12-22 20:44:47.104531152 +0100
+@@ -121,7 +121,7 @@
+ 	@set -e; for i in `echo $(SUBDIRS)`; do \
+ 		if [ -x $$i/configure ] ; then \
+ 			echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
+-			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --libdir=$(CONFIG_LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ 		elif [ -f $$i/Makefile.in ] ; then \
+ 			echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
+ 			$(MAKE) -C $$i -f Makefile.in config; \
+diff -Naur capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile
+--- capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile	2004-12-21 17:45:25.000000000 +0100
++++ capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile	2004-12-22 20:44:47.104531152 +0100
+@@ -8,7 +8,7 @@
+ #  as published by the Free Software Foundation; either version
+ #  2 of the License, or (at your option) any later version.
+ 
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+ 
+ include $(TOPDIR)/Rules.make
+ 
 diff -Naur capi4k-utils.orig/pppdcapiplugin/Rules.make capi4k-utils/pppdcapiplugin/Rules.make
 --- capi4k-utils.orig/pppdcapiplugin/Rules.make	2004-12-21 17:45:25.000000000 +0100
-+++ capi4k-utils/pppdcapiplugin/Rules.make	2004-12-22 13:55:14.433145016 +0100
++++ capi4k-utils/pppdcapiplugin/Rules.make	2004-12-22 20:44:32.481754152 +0100
 @@ -21,7 +21,7 @@
  all:	$(ALL)