summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-17 20:33:08 (UTC)
committer zautrix <zautrix>2004-10-17 20:33:08 (UTC)
commit50470fdeb0ed62f05ff6780607cc30a8e84ef5b1 (patch) (side-by-side diff)
tree87fbffa1db9d979dbe9c2e018cd2bdc5d833823f
parent4220d587eb43d4117e5d5a8a8f0cb6e8381b5fbe (diff)
downloadkdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.zip
kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.tar.gz
kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.tar.bz2
compile fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile16
-rw-r--r--Makefile.Embedded16
-rw-r--r--libkdepim/ksyncmanager.cpp4
-rw-r--r--version2
4 files changed, 21 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 6a8521f..84f909e 100644
--- a/Makefile
+++ b/Makefile
@@ -226,20 +226,20 @@ dist:
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
- ./mkipks kmicrokdelibs.control
- ./mkipks korganizer.control
- ./mkipks kaddressbook.control
+ mkipks kmicrokdelibs.control
+ mkipks korganizer.control
+ mkipks kaddressbook.control
ifndef BUILD_NO_MICROMAIL
- ./mkipks kopiemail.control
+ mkipks kopiemail.control
endif
- ./mkipks korganizer-alarm.control
+ mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- ./mkipks phoneaccess.control
+ mkipks phoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
- ./mkipks pwmanager.control
+ mkipks pwmanager.control
endif
- ./mkipks pim_TAB_icon.control
+ mkipks pim_TAB_icon.control
tmake: objects \
qtcompat/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 6a8521f..84f909e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -226,20 +226,20 @@ dist:
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
- ./mkipks kmicrokdelibs.control
- ./mkipks korganizer.control
- ./mkipks kaddressbook.control
+ mkipks kmicrokdelibs.control
+ mkipks korganizer.control
+ mkipks kaddressbook.control
ifndef BUILD_NO_MICROMAIL
- ./mkipks kopiemail.control
+ mkipks kopiemail.control
endif
- ./mkipks korganizer-alarm.control
+ mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
- ./mkipks phoneaccess.control
+ mkipks phoneaccess.control
endif
ifndef BUILD_NO_PWMANAGER
- ./mkipks pwmanager.control
+ mkipks pwmanager.control
endif
- ./mkipks pim_TAB_icon.control
+ mkipks pim_TAB_icon.control
tmake: objects \
qtcompat/Makefile$(PLATFORM) \
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 8851097..40d8e47 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -781,7 +781,11 @@ void KSyncManager::syncKDE()
break;
case (KOPI):
{
+#ifdef DESKTOP_VERSION
QString command = qApp->applicationDirPath () + "/kdecaldump";
+#else
+ QString command = "kdecaldump";
+#endif
if ( ! QFile::exists ( command ) )
command = "kdecaldump";
QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
diff --git a/version b/version
index f085278..de8a794 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.7";
+version = "1.9.8";