From 6a9ed80e27237c49b27ca5b63ae985a42e4d8b0f Mon Sep 17 00:00:00 2001
From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Mon, 26 May 2008 11:52:30 +0000
Subject: opie: move OPIE_BINDIR out of opie.bbclass into palmtop.bbclass. 
 Closes 3669. * commit by Laibsch

---
 classes/opie.bbclass    | 1 -
 classes/palmtop.bbclass | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 6324dbf522..bd1bbaf578 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -22,7 +22,6 @@ DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
 EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
-EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 # Opie standard TAG value
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index fa25d598e9..b4ee62c2a3 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -17,6 +17,7 @@ EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "ye
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN} += " ${palmtopdir} "
-- 
cgit v1.2.3