summaryrefslogtreecommitdiffstats
path: root/meta
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:54 +0100
commit55d77f5d0d092c14ea132be7144db093439d39ea (patch)
tree315568ea765c93f25c3e0cb550fa34b9b213cbd9 /meta
parent82a55f7808ba635f8ffc841cf9f3e7b675f91aea (diff)
downloadpoky-55d77f5d0d092c14ea132be7144db093439d39ea.tar.gz
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. (From OE-Core rev: c0cfd4f84c8f4843027332cfd6cf99c452c50dbb) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
37FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" 37FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
38 38
39PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests" 39PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
40FILES_${QT_BASE_NAME}-tests-dbg = "/usr/tests/qt4/*/.debug" 40FILES_${QT_BASE_NAME}-tests-dbg = "${prefix}/tests/qt4/*/.debug"
41FILES_${QT_BASE_NAME}-tests = "/usr/tests/qt4/*" 41FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*"
42 42
43do_configure_prepend() { 43do_configure_prepend() {
44 for pro in $(find ${S} -name "*.pro") ; do 44 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-.*
129ALLOW_EMPTY_${PN} = "1" 129ALLOW_EMPTY_${PN} = "1"
130FILES_${PN} = "" 130FILES_${PN} = ""
131FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" 131FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
132FILES_${PN}-dbg = "${exec_prefix}/src/debug/" 132FILES_${PN}-dbg = "/usr/src/debug/"
133FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch" 133FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
134RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" 134RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
135RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" 135RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"