bbfiles inheriting opie: don't override EXTRA_QMAKEVARS_POST|PRE, append to it

diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
index fbc9a06625c8a4b4e0fb7cdd0e3bb4b3100718a9..a2fa2e83a1edd7e693344f6260fc05c90bc4d63e 100644 (file)
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
@@ -9,8 +9,8 @@ APPNAME = "bluetooth-manager"
 
 S = "${WORKDIR}/manager"
 
-EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth "
-EXTRA_QMAKEVARS_PRE = 'LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp'
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/opietooth"
+EXTRA_QMAKEVARS_PRE += "LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp"
 
 inherit opie
 

diff --git a/packages/opie-camera/opie-camera.inc b/packages/opie-camera/opie-camera.inc
index c57855ac03983d72dc0efa02fba36226b7bc49e6..9dae4c218cbe6fa0b68fe9e5c7bc7624c4bc83ba 100644 (file)
--- a/packages/opie-camera/opie-camera.inc
+++ b/packages/opie-camera/opie-camera.inc
@@ -9,7 +9,7 @@ APPTYPE = "binary"
 
 S = "${WORKDIR}/camera"
 
-EXTRA_QMAKEVARS_POST=" LIBS+=-L.. "
+EXTRA_QMAKEVARS_POST += "LIBS+=-L.."
 PARALLEL_MAKE = ""
 
 inherit opie

diff --git a/packages/opie-dagger/opie-dagger.inc b/packages/opie-dagger/opie-dagger.inc
index 44213e04cac925484f8e35c005e46d2aaf56e4fa..705ca26cb6ed7df4da25c390e243b7baba236878 100644 (file)
--- a/packages/opie-dagger/opie-dagger.inc
+++ b/packages/opie-dagger/opie-dagger.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopieui2 sword"
 APPNAME = "dagger"
 
-EXTRA_QMAKEVARS_PRE = "LIBSWORD_INC_DIR=${STAGING_INCDIR}/sword"
+EXTRA_QMAKEVARS_PRE += "LIBSWORD_INC_DIR=${STAGING_INCDIR}/sword"
 
 S = "${WORKDIR}/${APPNAME}"
 

diff --git a/packages/opie-packagemanager/opie-packagemanager.inc b/packages/opie-packagemanager/opie-packagemanager.inc
index 3c3a22161b0e5b199d4a5e5e3cfc5ae3274d3560..0ec6b93fbf19394be4d6a9d82b0fcdc6e3cce140 100644 (file)
--- a/packages/opie-packagemanager/opie-packagemanager.inc
+++ b/packages/opie-packagemanager/opie-packagemanager.inc
@@ -3,14 +3,14 @@ SECTION = "opie/settings"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "libipkg "
+DEPENDS = "libipkg"
 APPNAME = "packagemanager"
 
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-EXTRA_QMAKEVARS_PRE = 'LIBIPK_INC_DIR=${STAGING_INCDIR}/libipkg'
+EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libipkg"
 
 do_install() {
     install -d ${D}${palmtopdir}/pics/${APPNAME}