diff options
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 37fc1dd7d5..84c0ae9dab 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
| @@ -213,7 +213,7 @@ do_configure() { | |||
| 213 | cp -f ${WORKDIR}/linux.conf mkspecs/common/ | 213 | cp -f ${WORKDIR}/linux.conf mkspecs/common/ |
| 214 | 214 | ||
| 215 | echo "[Paths]" > $QT_CONF_PATH | 215 | echo "[Paths]" > $QT_CONF_PATH |
| 216 | echo "Prefix=${prefix}/" >> $QT_CONF_PATH | 216 | echo "Prefix=${prefix}" >> $QT_CONF_PATH |
| 217 | echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH | 217 | echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH |
| 218 | echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH | 218 | echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH |
| 219 | echo "Libraries=${libdir}" >> $QT_CONF_PATH | 219 | echo "Libraries=${libdir}" >> $QT_CONF_PATH |
| @@ -229,7 +229,7 @@ do_configure() { | |||
| 229 | ${EXTRA_QMAKE_MUNGE}|| true | 229 | ${EXTRA_QMAKE_MUNGE}|| true |
| 230 | 230 | ||
| 231 | echo yes | QT_LICENSE_FILE="${QT_LICENSE_FILE}" ./configure -v \ | 231 | echo yes | QT_LICENSE_FILE="${QT_LICENSE_FILE}" ./configure -v \ |
| 232 | -prefix ${prefix}/ \ | 232 | -prefix ${prefix} \ |
| 233 | -bindir ${bindir} \ | 233 | -bindir ${bindir} \ |
| 234 | -libdir ${libdir} \ | 234 | -libdir ${libdir} \ |
| 235 | -datadir ${datadir}/${QT_DIR_NAME} \ | 235 | -datadir ${datadir}/${QT_DIR_NAME} \ |
| @@ -358,7 +358,7 @@ do_install() { | |||
| 358 | 358 | ||
| 359 | # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: | 359 | # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: |
| 360 | for pc in ${D}${libdir}/pkgconfig/*.pc ; do | 360 | for pc in ${D}${libdir}/pkgconfig/*.pc ; do |
| 361 | sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \ | 361 | sed -i -e "s:prefix}/include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \ |
| 362 | -e 's:IP{:I${:g' $pc | 362 | -e 's:IP{:I${:g' $pc |
| 363 | done | 363 | done |
| 364 | 364 | ||
