SOURCES: kiax-system_iaxclient_libs.diff - fix paths
arekm
arekm at pld-linux.org
Mon Apr 24 20:48:05 CEST 2006
Author: arekm Date: Mon Apr 24 18:48:05 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix paths
---- Files affected:
SOURCES:
kiax-system_iaxclient_libs.diff (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/kiax-system_iaxclient_libs.diff
diff -u SOURCES/kiax-system_iaxclient_libs.diff:1.2 SOURCES/kiax-system_iaxclient_libs.diff:1.3
--- SOURCES/kiax-system_iaxclient_libs.diff:1.2 Wed Apr 12 23:00:24 2006
+++ SOURCES/kiax-system_iaxclient_libs.diff Mon Apr 24 20:48:00 2006
@@ -1,6 +1,6 @@
diff -urN kiax-0.8.5-src.org/qkiax.pro kiax-0.8.5-src/qkiax.pro
---- kiax-0.8.5-src.org/qkiax.pro 2005-04-08 16:29:52.000000000 +0200
-+++ kiax-0.8.5-src/qkiax.pro 2006-04-12 22:52:58.866941250 +0200
+--- kiax-0.8.5-src.org/qkiax.pro 2005-04-08 14:29:52.000000000 +0000
++++ kiax-0.8.5-src/qkiax.pro 2006-04-24 18:42:09.268407250 +0000
@@ -3,15 +3,14 @@
# Subdir relative project main directory: .
# Target is a subdirs project
@@ -21,8 +21,8 @@
bin
+LIBS += -liaxclient
diff -urN kiax-0.8.5-src.org/src/src.pro kiax-0.8.5-src/src/src.pro
---- kiax-0.8.5-src.org/src/src.pro 2006-03-26 00:21:25.000000000 +0100
-+++ kiax-0.8.5-src/src/src.pro 2006-04-12 22:55:46.869440750 +0200
+--- kiax-0.8.5-src.org/src/src.pro 2006-03-25 23:21:25.000000000 +0000
++++ kiax-0.8.5-src/src/src.pro 2006-04-24 18:42:09.268407250 +0000
@@ -7,11 +7,11 @@
icons \
translations
@@ -56,9 +56,24 @@
CONFIG += release \
warn_on \
diff -urN kiax-0.8.5-src.org/src/src.pro.or kiax-0.8.5-src/src/src.pro.or
---- kiax-0.8.5-src.org/src/src.pro.or 2006-03-26 00:21:46.000000000 +0100
-+++ kiax-0.8.5-src/src/src.pro.or 2006-04-12 22:54:18.523919500 +0200
-@@ -86,10 +86,8 @@
+--- kiax-0.8.5-src.org/src/src.pro.or 2006-03-25 23:21:46.000000000 +0000
++++ kiax-0.8.5-src/src/src.pro.or 2006-04-24 18:42:59.507547000 +0000
+@@ -7,11 +7,11 @@
+ icons \
+ translations
+ translations.files += ../i18n/*.qm
+-translations.path = /usr/local/share/kiax/i18n/
++translations.path = /usr/share/kiax/i18n/
+ icons.files += ../icons/*.png
+-icons.path = /usr/local/share/kiax/icons/
++icons.path = /usr/share/kiax/icons/
+ binary.files += ../bin/kiax
+-binary.path = /usr/local/bin/
++binary.path = /usr/bin/
+ FORMS += aboutbox.ui \
+ logwindow.ui \
+ mainwindow.ui \
+@@ -86,12 +86,10 @@
kiaxcontactlistitem.cpp \
kiaxiconfactory.cpp \
kiaxkeyfilter.cpp
@@ -66,8 +81,12 @@
-LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
-INCLUDEPATH = ../src \
-../lib
+-DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
+-I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
+LIBS += -liaxclient ${LIBOSSAUDIO}
+INCLUDEPATH = ../src /usr/include/iaxclient
- DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
- I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
++DEFINES = ICONS_PATH=\"/usr/share/kiax/icons/\" \
++I18N_DIRECTORY=\"/usr/share/kiax/i18n/\"
TARGET = ../bin/kiax
+ CONFIG += release \
+ warn_on \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kiax-system_iaxclient_libs.diff?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list