diff options
author | Phil Blundell <pb@pbcl.net> | 2013-04-29 18:28:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-02 17:41:54 +0100 |
commit | 55d77f5d0d092c14ea132be7144db093439d39ea (patch) | |
tree | 315568ea765c93f25c3e0cb550fa34b9b213cbd9 /meta/recipes-qt/qt4/qt4-4.8.4.inc | |
parent | 82a55f7808ba635f8ffc841cf9f3e7b675f91aea (diff) | |
download | poky-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/recipes-qt/qt4/qt4-4.8.4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.4.inc | 4 |
1 files changed, 2 insertions, 2 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 | |||
37 | FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" | 37 | FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" |
38 | 38 | ||
39 | PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests" | 39 | PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests" |
40 | FILES_${QT_BASE_NAME}-tests-dbg = "/usr/tests/qt4/*/.debug" | 40 | FILES_${QT_BASE_NAME}-tests-dbg = "${prefix}/tests/qt4/*/.debug" |
41 | FILES_${QT_BASE_NAME}-tests = "/usr/tests/qt4/*" | 41 | FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*" |
42 | 42 | ||
43 | do_configure_prepend() { | 43 | do_configure_prepend() { |
44 | for pro in $(find ${S} -name "*.pro") ; do | 44 | for pro in $(find ${S} -name "*.pro") ; do |