4 files changed, 22 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 6a8521f..84f909e 100644
--- a/Makefile
+++ b/Makefile
@@ -221,30 +221,30 @@ install:
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
         cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
         @echo Dont forget to do "make install" before "make 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) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 6a8521f..84f909e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -221,30 +221,30 @@ install:
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
         cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
         @echo Dont forget to do "make install" before "make 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) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 8851097..40d8e47 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -776,17 +776,21 @@ void KSyncManager::syncKDE()
     emit save();
     switch(mTargetApp)
         {
         case (KAPI):
 
             break;
         case (KOPI):
             {
-                QString command = qApp->applicationDirPath () + "/kdecaldump";  
+#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";
                 system (  command.latin1());
                     if ( syncWithFile( fileName,true ) ) {
                         if ( mWriteBackFile ) {
                             command += " --read";
                             system (  command.latin1());
diff --git a/version b/version
index f085278..de8a794 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.7";
+version = "1.9.8";