summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-12-26 00:28:07 +0000
committerHolger Freyther <zecke@selfish.org>2007-12-26 00:28:07 +0000
commit6e03f54929969450bcc876200c6aabcb7123cbe3 (patch)
tree6ce6fe5a92f45e42e8a4d343ae516c2499a3a3b8
parent3546c7ce48a6b59ae071228593a66caeb9394929 (diff)
packages/qt4/qt_packaging.inc: Do not remove everything from the bindir, fix the glob
-${PN}-doc already has the html documentation, no need for -documentation package -Package the demos and exmaples -.debug and translations are missing
-rw-r--r--packages/qt4/qt_packaging.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc
index 7d39591846..9c3d0b94d7 100644
--- a/packages/qt4/qt_packaging.inc
+++ b/packages/qt4/qt_packaging.inc
@@ -31,8 +31,7 @@ DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
${QT_BASE_LIB}script4-dev \
${QT_BASE_LIB}dbus4-dev \
${QT_BASE_LIB}opengl4-dev \
- ${QT_BASE_LIB}uitools4-dev \
- ${QT_BASE_LIB}-documentation"
+ ${QT_BASE_LIB}uitools4-dev"
DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
${QT_BASE_LIB}gui4-dbg \
@@ -128,14 +127,11 @@ FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
-FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}-examples/*"
-FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}-demos/*"
+FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}/demos/*"
FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts"
-
-FILES_${QT_BASE_NAME}-documentation = "${docdir}/${QT_DIR_NAME}/html/*"
-
python populate_packages_prepend() {
translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' )
@@ -146,7 +142,7 @@ do_install() {
oe_runmake install INSTALL_ROOT=${D}
# These are host binaries, we should only use them in staging
- rm -rf ${D}/${bindir}
+ rm -rf ${D}/${bindir}/qmake
rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs
install -d ${D}/${libdir}/fonts