summaryrefslogtreecommitdiff
path: root/recipes/qt4
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-07-13 01:32:19 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-07-13 01:32:19 +0400
commit26bcb9945b54e6d849fe4905688758b5a8006389 (patch)
tree25e66e55311d2e7212f87be1193c7d585e4a3e5a /recipes/qt4
parent0bab68016165040c906baabe5ec7f1a5426ead82 (diff)
parentb296387c6227c3ab870277f77b2d30110475e00c (diff)
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/qt4.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 427bbaecb4..42e2726e5a 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -110,7 +110,7 @@ do_configure() {
cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/
echo "[Paths]" > $QT_CONF_PATH
- echo "Prefix=${prefix}" >> $QT_CONF_PATH
+ echo "Prefix=${prefix}/" >> $QT_CONF_PATH
echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
echo "Libraries=${libdir}" >> $QT_CONF_PATH
@@ -125,7 +125,7 @@ do_configure() {
${EXTRA_QMAKE_MUNGE}|| true
(echo o; echo yes) | ./configure -v \
- -prefix ${prefix} \
+ -prefix ${prefix}/ \
-bindir ${bindir} \
-libdir ${libdir} \
-datadir ${datadir}/${QT_DIR_NAME} \