summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2013-04-29 18:28:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-02 17:41:23 +0100
commitc0cfd4f84c8f4843027332cfd6cf99c452c50dbb (patch)
treece5ef170871ee3dbd1f6deb188fa0d6b0bb7b1fd /meta/recipes-qt
parente3634ec359a71c9858698cb597d23c05b1184d2e (diff)
downloadopenembedded-core-c0cfd4f84c8f4843027332cfd6cf99c452c50dbb.tar.gz
openembedded-core-c0cfd4f84c8f4843027332cfd6cf99c452c50dbb.tar.bz2
openembedded-core-c0cfd4f84c8f4843027332cfd6cf99c452c50dbb.zip
qt4: Fix sundry erroneous assumptions about ${prefix}
FILES_${QT_BASE_NAME}-tests was hard-coded to "/usr/tests/..." but Qt actually installs these files into ${prefix}/tests. Conversely, FILES_${PN}-dbg in qt4.inc was defined in terms of ${exec_prefix}/src, which appears commendable but doesn't actually match where package.bbclass will put the sources since the latter is hard-coded to /usr/src. This fixes a large number of "installed but not shipped" warnings when ${prefix} is set to something other than /usr. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4.inc4
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4.inc b/meta/recipes-qt/qt4/qt4-4.8.4.inc
index 3f0f0036c4..9da3557335 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.4.inc
@@ -37,8 +37,8 @@ FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump
FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
-FILES_${QT_BASE_NAME}-tests-dbg = "/usr/tests/qt4/*/.debug"
-FILES_${QT_BASE_NAME}-tests = "/usr/tests/qt4/*"
+FILES_${QT_BASE_NAME}-tests-dbg = "${prefix}/tests/qt4/*/.debug"
+FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*"
do_configure_prepend() {
for pro in $(find ${S} -name "*.pro") ; do
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 35e3003470..37fc1dd7d5 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -129,7 +129,7 @@ PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.*
ALLOW_EMPTY_${PN} = "1"
FILES_${PN} = ""
FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
-FILES_${PN}-dbg = "${exec_prefix}/src/debug/"
+FILES_${PN}-dbg = "/usr/src/debug/"
FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"