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 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
 
 libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_CFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS)
 
 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,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/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 20:44:32.481754152 +0100
@@ -21,7 +21,7 @@
 all:	$(ALL)
 
 capiplugin.so: capiplugin.o capiconn.o
-	$(CC) -o $@ $(LDFLAGS) capiplugin.o capiconn.o -lcapi20dyn
+	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) capiplugin.o capiconn.o -lcapi20dyn
 
 userpass.so: userpass.o
 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) -nostdlib userpass.o
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/Makefile.template ./pppdcapiplugin/Makefile.template
--- ../capi4k-utils.orig/pppdcapiplugin/Makefile.template	2001-05-01 14:43:49.000000000 +0200
+++ ./pppdcapiplugin/Makefile.template	2011-02-19 22:45:36.613077158 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile ./pppdcapiplugin/ppp-2.3.11/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile	2001-05-01 14:43:49.000000000 +0200
+++ ./pppdcapiplugin/ppp-2.3.11/Makefile	2011-02-19 22:45:36.609744073 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile ./pppdcapiplugin/ppp-2.4.0/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile	2001-05-01 14:43:50.000000000 +0200
+++ ./pppdcapiplugin/ppp-2.4.0/Makefile	2011-02-19 22:45:36.616410243 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile ./pppdcapiplugin/ppp-2.4.1/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile	2001-05-01 14:43:50.000000000 +0200
+++ ./pppdcapiplugin/ppp-2.4.1/Makefile	2011-02-19 22:45:36.619743328 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile ./pppdcapiplugin/ppp-2.4.1b1/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile	2001-05-01 14:43:51.000000000 +0200
+++ ./pppdcapiplugin/ppp-2.4.1b1/Makefile	2011-02-19 22:45:36.623076413 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile ./pppdcapiplugin/ppp-2.4.1b2/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile	2001-05-01 14:43:52.000000000 +0200
+++ ./pppdcapiplugin/ppp-2.4.1b2/Makefile	2011-02-19 22:45:36.626409498 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile ./pppdcapiplugin/ppp-2.4.2b3/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile	2003-05-18 22:11:15.000000000 +0200
+++ ./pppdcapiplugin/ppp-2.4.2b3/Makefile	2011-02-19 22:45:36.586412480 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile ./pppdcapiplugin/ppp-2.4.3/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile	2004-12-13 23:05:14.000000000 +0100
+++ ./pppdcapiplugin/ppp-2.4.3/Makefile	2011-02-19 22:45:36.626409498 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile ./pppdcapiplugin/ppp-2.4.4/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile	2011-02-19 22:45:02.235639872 +0100
+++ ./pppdcapiplugin/ppp-2.4.4/Makefile	2011-02-19 22:45:36.629742583 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile ./pppdcapiplugin/ppp-2.4.5/Makefile
--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile	2011-02-19 22:45:02.242306040 +0100
+++ ./pppdcapiplugin/ppp-2.4.5/Makefile	2011-02-19 22:45:36.633075668 +0100
@@ -8,7 +8,8 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
+include ../../.config
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make