--- kphoneSI_1.0/icons/Makefile.in.orig	2006-06-17 15:17:05.000000000 +0200
+++ kphoneSI_1.0/icons/Makefile.in	2006-06-17 15:15:56.000000000 +0200
@@ -4,9 +4,9 @@
 ICON_DIR=$(SHAREDIR)/icons
 
 install:
-	install --mode=0755 --directory $(ICON_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(ICON_DIR)
 	for T in *.png; do \
-		install --mode=0644 $$T $(ICON_DIR); \
+		install --mode=0644 $$T $(DESTDIR)$(ICON_DIR); \
 	done
 
 uninstall:
--- kphoneSI_1.0/kphone/Makefile.in.orig	2006-03-27 13:34:24.000000000 +0200
+++ kphoneSI_1.0/kphone/Makefile.in	2006-06-17 15:16:14.000000000 +0200
@@ -10,19 +10,17 @@
 
 CFLAGS=@CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS)
 CXXFLAGS=$(CFLAGS)
-ifeq (@ENABLE_MIKEY@,yes)
-LIBS=@LIBS@ -lssl -lcrypto -lresolv -lsrtp -lmikey -lmutil @LIBJACK@ @LIBALSA@
-else
-LIBS=@LIBS@ -lssl -lcrypto -lresolv -lsrtp @LIBJACK@ @LIBALSA@
-endif
+LIBS=@LIBS@ -lssl -lcrypto -lresolv @LIBJACK@ @LIBALSA@
 LDFLAGS=@LDFLAGS@ -g
 
 ifeq (@ENABLE_MIKEY@,yes)
 SM=mikey
+LIBS+=-lmikey -lmutil
 endif
 
 ifeq (@ENABLE_SRTP@,yes)
-SR=srtp 
+SR=srtp
+LIBS+=-lsrtp
 endif
 
 SUBLIBS=dissipate2 $(SR) $(SM)  gsm ilbc Speex 
--- kphoneSI_1.0/kphone/Makefile.in.orig	2006-06-17 15:19:14.000000000 +0200
+++ kphoneSI_1.0/kphone/Makefile.in	2006-06-17 15:19:46.000000000 +0200
@@ -76,11 +76,11 @@
 all:	kpsi
 
 install:	all
-	install --mode=0755 --directory $(BIN_DIR)
-	install --strip kpsi $(BIN_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
+	install --strip kpsi $(DESTDIR)$(BIN_DIR)
 
 uninstall:
-	rm -f $(BIN_DIR)/kphone 
+	rm -f $(BIN_DIR)/kpsi 
 
 clean:
 	rm -f kpsi *.o *.a *~ *.moc.cpp *.bak core
--- kphoneSI_1.0/ringing/Makefile.in.orig	2006-06-17 15:22:04.000000000 +0200
+++ kphoneSI_1.0/ringing/Makefile.in	2006-06-17 15:24:11.000000000 +0200
@@ -1,10 +1,10 @@
 # Generated automatically from Makefile.in by configure.
 CXX=c++
 
-prefix=/usr/local
-exec_prefix=${prefix}
-SHARE_DIR=${prefix}/share/apps/kphone
-BIN_DIR=${exec_prefix}/bin
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+SHARE_DIR=@datadir@/KphoneSI
+BIN_DIR=@bindir@
 
 
 LIBS=-lasound  
@@ -17,11 +17,11 @@
 all:	kphonering
 
 install:	all
-	install --mode=0755 --directory $(DESTDIR)/$(BIN_DIR)
-	install --strip kphonering $(DESTDIR)/$(BIN_DIR)
+	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
+	install --strip kphonering $(DESTDIR)$(BIN_DIR)
 
 uninstall:
-	rm -f $(DESTDIR)/$(BIN_DIR)/kphonering
+	rm -f $(DESTDIR)$(BIN_DIR)/kphonering
 
 clean:
 	rm -f kphonering *.o  *~  *.bak core
--- kphoneSI_1.0/srtp/Makefile.in.orig	2006-06-17 19:55:56.000000000 +0200
+++ kphoneSI_1.0/srtp/Makefile.in	2006-06-17 19:56:54.000000000 +0200
@@ -1,8 +1,9 @@
 CXX=@CXX@
 #CC=@CC@
+AR=ar
 
 AFLAGS=-g
-CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
+CFLAGS=@CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
 CXXFLAGS=$(CFLAGS)
 
 LIBS=@LIBS@
@@ -28,4 +29,4 @@
 	makedepend -- $(CXXFLAGS) *.cpp
 
 srtp.a: $(OBJS)
-	ar rcs $@ $(OBJS)
+	$(AR) rcs $@ $(OBJS)
--- kphoneSI_1.0/srtp-1.4/Makefile.in.orig	2006-06-17 19:55:56.000000000 +0200
+++ kphoneSI_1.0/srtp-1.4/Makefile.in	2006-06-17 19:56:54.000000000 +0200
@@ -1,8 +1,9 @@
 CXX=@CXX@
 #CC=@CC@
+AR=ar
 
 AFLAGS=-g
-CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
+CFLAGS=@CFLAGS@ -I. -I.. @DEFS@ @THREAD_FLAG@
 CXXFLAGS=$(CFLAGS)
 
 LIBS=@LIBS@
@@ -28,4 +29,4 @@
 	makedepend -- $(CXXFLAGS) *.cpp
 
 srtp.a: $(OBJS)
-	ar rcs $@ $(OBJS)
+	$(AR) rcs $@ $(OBJS)