4 files changed, 6 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 9656532..b2ef295 100644
--- a/Makefile
+++ b/Makefile
@@ -212,65 +212,65 @@ objects:
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
         mkdir -p pwmanager/libcrypt/$(PLATFORM)
 
 clean:
         rm -rf libical/lib/$(PLATFORM)/*;
         rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
         for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 
 pac:
         rm -f $(QPEDIR)/lib/libmicro*
         rm -f $(QPEDIR)/plugins/applets/libkopi*
         make
         make install
         make dist
 install:
 
         cd bin/kdepim; make install
         cp -r Pim $(QPEDIR)/apps
         cp db2file/db2file $(QPEDIR)/bin/db2file
         chmod ugo+x $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
         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 *ipk.zip
-        rm -f ../new_$(KDEPIM_VERSION)/*
+        rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
         rm -f *~
         cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
         cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
         cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
         mkipks kmicrokdelibs.control
         mkipks korganizer.control
         mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         mkipks kopiemail.control
   endif
   ifndef BUILD_NO_SHARP_PLUGIN
         mkipks ksharpPIM-DTMaccess.control
   endif
         mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
         mkipks kmobilephoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
         mkipks pwmanager.control
   endif
         mkipks pimTABicon.control
         zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
         mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
         mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
         mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 9656532..b2ef295 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -212,65 +212,65 @@ objects:
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
         mkdir -p pwmanager/libcrypt/$(PLATFORM)
 
 clean:
         rm -rf libical/lib/$(PLATFORM)/*;
         rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
         for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 
 pac:
         rm -f $(QPEDIR)/lib/libmicro*
         rm -f $(QPEDIR)/plugins/applets/libkopi*
         make
         make install
         make dist
 install:
 
         cd bin/kdepim; make install
         cp -r Pim $(QPEDIR)/apps
         cp db2file/db2file $(QPEDIR)/bin/db2file
         chmod ugo+x $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
         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 *ipk.zip
-        rm -f ../new_$(KDEPIM_VERSION)/*
+        rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
         rm -f *~
         cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
         cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
         cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
         mkipks kmicrokdelibs.control
         mkipks korganizer.control
         mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         mkipks kopiemail.control
   endif
   ifndef BUILD_NO_SHARP_PLUGIN
         mkipks ksharpPIM-DTMaccess.control
   endif
         mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
         mkipks kmobilephoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
         mkipks pwmanager.control
   endif
         mkipks pimTABicon.control
         zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
         mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
         mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
         mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
diff --git a/bin/kdepim/Makefile b/bin/kdepim/Makefile
index 6003cf0..f7aa7bd 100644
--- a/bin/kdepim/Makefile
+++ b/bin/kdepim/Makefile
@@ -1,19 +1,19 @@
 install:
-        rm -r  $(QPEDIR)/pics/kdepim
+        rm -rf  $(QPEDIR)/pics/kdepim
         cp -r . $(QPEDIR)/pics/kdepim
-        rm -r  $(QPEDIR)/pics/kdepim/*~
+        rm -rf  $(QPEDIR)/pics/kdepim/*~
         rm  $(QPEDIR)/pics/kdepim/Makefile*
         rm -r  $(QPEDIR)/pics/kdepim/CVS
         rm -r  $(QPEDIR)/pics/kdepim/pwmanager/CVS
         rm -r  $(QPEDIR)/pics/kdepim/pwmanager/icons16/CVS
         rm -r  $(QPEDIR)/pics/kdepim/pwmanager/icons22/CVS
         rm -r  $(QPEDIR)/pics/kdepim/korganizer/CVS
         rm -r  $(QPEDIR)/pics/kdepim/korganizer/icons16/CVS
         rm -r  $(QPEDIR)/pics/kdepim/korganizer/iconsmini/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kaddressbook/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kaddressbook/icons16/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kaddressbook/icons22/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kopiemail/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kopiemail/icons22/CVS
         cp korganizer/ko*.png $(QPEDIR)/pics
         cp korganizer/ko24.png $(QPEDIR)/pics/ko24ti.png
\ No newline at end of file
diff --git a/bin/kdepim/Makefile.bup b/bin/kdepim/Makefile.bup
index 6003cf0..f7aa7bd 100644
--- a/bin/kdepim/Makefile.bup
+++ b/bin/kdepim/Makefile.bup
@@ -1,19 +1,19 @@
 install:
-        rm -r  $(QPEDIR)/pics/kdepim
+        rm -rf  $(QPEDIR)/pics/kdepim
         cp -r . $(QPEDIR)/pics/kdepim
-        rm -r  $(QPEDIR)/pics/kdepim/*~
+        rm -rf  $(QPEDIR)/pics/kdepim/*~
         rm  $(QPEDIR)/pics/kdepim/Makefile*
         rm -r  $(QPEDIR)/pics/kdepim/CVS
         rm -r  $(QPEDIR)/pics/kdepim/pwmanager/CVS
         rm -r  $(QPEDIR)/pics/kdepim/pwmanager/icons16/CVS
         rm -r  $(QPEDIR)/pics/kdepim/pwmanager/icons22/CVS
         rm -r  $(QPEDIR)/pics/kdepim/korganizer/CVS
         rm -r  $(QPEDIR)/pics/kdepim/korganizer/icons16/CVS
         rm -r  $(QPEDIR)/pics/kdepim/korganizer/iconsmini/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kaddressbook/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kaddressbook/icons16/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kaddressbook/icons22/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kopiemail/CVS
         rm -r  $(QPEDIR)/pics/kdepim/kopiemail/icons22/CVS
         cp korganizer/ko*.png $(QPEDIR)/pics
         cp korganizer/ko24.png $(QPEDIR)/pics/ko24ti.png
\ No newline at end of file