diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2006-04-22 23:15:27 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-22 23:15:27 +0000 |
| commit | 207f2981251c3a1ce5a5beb0ccae858111998662 (patch) | |
| tree | 742ddb5f303f45c65b9643be61451a0fd06f31cf /classes | |
| parent | 6fafa3e31879a6ee0cd590c912391cbb1f39bf48 (diff) | |
| download | openembedded-207f2981251c3a1ce5a5beb0ccae858111998662.tar.gz | |
libqpe/libopie: don't override EXTRA_QMAKEVARS_POST|PRE given in class
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/opie.bbclass | 2 | ||||
| -rw-r--r-- | classes/palmtop.bbclass | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index c00f7e19a9..d0433d5035 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -23,7 +23,7 @@ OPIE_CVS_PV = "1.2.1+cvs-${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" # to be consistent, put all targets into workdir -EXTRA_QMAKEVARS_POST_append = " DESTDIR=${S}" +EXTRA_QMAKEVARS_POST += "DESTDIR=${S}" # Opie standard TAG value TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index e54d9e8587..083f5148a1 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -9,8 +9,8 @@ inherit qmake EXTRA_QMAKEVARS_POST += "DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++" -EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "",d)}' +EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", " ",d)}' -DEPENDS_prepend = "virtual/libqpe1 uicmoc-native " +DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" FILES_${PN} = "${palmtopdir}" |