From 2848d8373ab0785cd21c4588d8fe7ad21ad6f291 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sun, 12 Sep 2004 09:10:04 +0000
Subject: Better version handling when building ipk packages

---
diff --git a/Makefile b/Makefile
index ec2277e..77def29 100644
--- a/Makefile
+++ b/Makefile
@@ -183,13 +183,16 @@ clean:
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
+    ifdef KDEPIM_VERSION
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(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
-
+    else
+    @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
+    endif
 dist:
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
diff --git a/Makefile.Embedded b/Makefile.Embedded
index ec2277e..77def29 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -183,13 +183,16 @@ clean:
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
+    ifdef KDEPIM_VERSION
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(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
-
+    else
+    @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
+    endif
 dist:
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
diff --git a/kaddressbook.control b/kaddressbook.control
index 2e93f30..542ce1e 100644
--- a/kaddressbook.control
+++ b/kaddressbook.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
diff --git a/kammu.control b/kammu.control
index db52c80..07559e7 100644
--- a/kammu.control
+++ b/kammu.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: Special version of gammu / libgammu
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index d894176..ef541a5 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends:
 Description: KOrganizer/Pi and Kaddressbook/Pi
diff --git a/kopiemail.control b/kopiemail.control
index 52cf554..46a0235 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
diff --git a/korganizer-alarm.control b/korganizer-alarm.control
index b200ea9..68bc398 100644
--- a/korganizer-alarm.control
+++ b/korganizer-alarm.control
@@ -3,7 +3,7 @@ Priority: optional
 Section: qpe/applications
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Description: KOrganizer/Pi Alarm Daemon
  The alarm daemon needed by KOrganizer/Platform-independend showing alarms.
diff --git a/korganizer.control b/korganizer.control
index ee2e1a3..f66381e 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
diff --git a/pim_TAB_icon.control b/pim_TAB_icon.control
index 3b3343b..25e99ea 100644
--- a/pim_TAB_icon.control
+++ b/pim_TAB_icon.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: Icon for Pim TAB
diff --git a/setZaurus b/setZaurus
index 4767716..2493ccb 100644
--- a/setZaurus
+++ b/setZaurus
@@ -15,4 +15,5 @@ export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
 export PLATFORM=zaurus
 export RELEASE_DEBUG=release
 export SHARPDTMSDK=/opt/dtm
-#export RELEASE_DEBUG=debug
\ No newline at end of file
+#export RELEASE_DEBUG=debug
+export KDEPIM_VERSION=1.9.4a
\ No newline at end of file
--
cgit v0.9.0.2