diff -Nur kphoneSI.orig/icons/Makefile.in kphoneSI/icons/Makefile.in --- kphoneSI.orig/icons/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/icons/Makefile.in 2006-10-02 16:55:54.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: diff -Nur kphoneSI.orig/kdial/Makefile.in kphoneSI/kdial/Makefile.in --- kphoneSI.orig/kdial/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/kdial/Makefile.in 2006-10-02 16:55:54.000000000 +0200 @@ -16,11 +16,11 @@ all: kpsidial install: all - install --mode=0755 --directory $(BIN_DIR) - install --strip kpsidial $(BIN_DIR) + install --mode=0755 --directory $(DESTDIR)$(BIN_DIR) + install --strip kpsidial $(DESTDIR)$(BIN_DIR) uninstall: - rm -f $(BIN_DIR)/kpsidial + rm -f $(DESTDIR)$(BIN_DIR)/kpsidial clean: rm -f kpsidial *.o *~ *.bak core diff -Nur kphoneSI.orig/kphone/Makefile.in kphoneSI/kphone/Makefile.in --- kphoneSI.orig/kphone/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/kphone/Makefile.in 2006-10-02 16:56:09.000000000 +0200 @@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@ SHARE_DIR=@datadir@/KPhoneSI BIN_DIR=@bindir@ -MAN_DIR=${exec_prefix}/man/man1 +MAN_DIR=@mandir@ MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" @@ -76,14 +76,14 @@ all: kpsi install: all - install --mode=0755 --directory $(BIN_DIR) - install --strip kpsi $(BIN_DIR) - install kphone.1 $(MAN_DIR) - install kpsi.1 $(MAN_DIR) + install --mode=0755 --directory $(DESTDIR)$(BIN_DIR) $(DESTDIR)$(MAN_DIR) + install --strip kpsi $(DESTDIR)$(BIN_DIR) + install kphone.1 $(DESTDIR)$(MAN_DIR) + install kpsi.1 $(DESTDIR)$(MAN_DIR) uninstall: - rm -f $(BIN_DIR)/kphone - rm -f $(MAN_DIR)/kphone.1 - rm -f $(MAN_DIR)/kpsi.1 + rm -f $(DESTDIR)$(BIN_DIR)/kphone + rm -f $(DESTDIR)$(MAN_DIR)/kphone.1 + rm -f $(DESTDIR)$(MAN_DIR)/kpsi.1 clean: rm -f kpsi *.o *.a *~ *.moc.cpp *.bak core diff -Nur kphoneSI.orig/po/Makefile.in kphoneSI/po/Makefile.in --- kphoneSI.orig/po/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/po/Makefile.in 2006-10-02 16:55:54.000000000 +0200 @@ -18,9 +18,9 @@ install: $(QM) - install --mode=0755 --directory $(PO_DIR) + install --mode=0755 --directory $(DESTDIR)$(PO_DIR) for T in *.qm; do \ - install --mode=0644 $$T $(PO_DIR); \ + install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \ done uninstall: diff -Nur kphoneSI.orig/ringing/Makefile.in kphoneSI/ringing/Makefile.in --- kphoneSI.orig/ringing/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/ringing/Makefile.in 2006-10-02 16:55:54.000000000 +0200 @@ -16,16 +16,16 @@ all: kphonering install: all - install --mode=0755 --directory $(BIN_DIR) - install --strip kphonering $(BIN_DIR) - install kphoneringsh $(BIN_DIR) - install --mode=0755 --directory $(SHARE_DIR) - install ring.wav $(SHARE_DIR) + install --mode=0755 --directory $(DESTDIR)$(BIN_DIR) + install --strip kphonering $(DESTDIR)$(BIN_DIR) + install kphoneringsh $(DESTDIR)$(BIN_DIR) + install --mode=0755 --directory $(DESTDIR)$(SHARE_DIR) + install ring.wav $(DESTDIR)$(SHARE_DIR) uninstall: - rm -f $(BIN_DIR)/kphonering - rm -f $(BIN_DIR)/kphoneringsh - rm -r $(SHARE_DIR) + rm -f $(DESTDIR)$(BIN_DIR)/kphonering + rm -f $(DESTDIR)$(BIN_DIR)/kphoneringsh + rm -r $(DESTDIR)$(SHARE_DIR) clean: rm -f kphonering *.o *~ *.bak core diff -Nur kphoneSI.orig/srtp/Makefile.in kphoneSI/srtp/Makefile.in --- kphoneSI.orig/srtp/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/srtp/Makefile.in 2006-10-02 16:55: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) diff -Nur kphoneSI.orig/srtp-1.4/Makefile.in kphoneSI/srtp-1.4/Makefile.in --- kphoneSI.orig/srtp-1.4/Makefile.in 2006-10-02 16:55:47.000000000 +0200 +++ kphoneSI/srtp-1.4/Makefile.in 2006-10-02 16:55: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)