From 9e2aff98b4ef3ab00538ff471ac7de5ad37ae59f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 24 Apr 2006 10:12:43 +0000 Subject: bbfiles inheriting opie: don't override EXTRA_QMAKEVARS_POST|PRE, append to it --- packages/opie-bluetoothmanager/opie-bluetoothmanager.inc | 4 ++-- packages/opie-camera/opie-camera.inc | 2 +- packages/opie-dagger/opie-dagger.inc | 2 +- packages/opie-packagemanager/opie-packagemanager.inc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc index fbc9a06625..a2fa2e83a1 100644 --- 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 c57855ac03..9dae4c218c 100644 --- 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 44213e04ca..705ca26cb6 100644 --- 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 3c3a22161b..0ec6b93fbf 100644 --- 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 " 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} -- cgit v1.2.3