summaryrefslogtreecommitdiffstats
path: root/recipes/qt4
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-07-13 10:06:09 +0200
committerKoen Kooi <koen@openembedded.org>2009-07-13 10:06:09 +0200
commita41c726ede88bd70b0428481819097489d728bf3 (patch)
tree41cdbc8007207e8dc01650bc81c5585399b68920 /recipes/qt4
parentad99da239d8c5ea4f470e4572dc47c8c032d9627 (diff)
parent26bcb9945b54e6d849fe4905688758b5a8006389 (diff)
downloadopenembedded-a41c726ede88bd70b0428481819097489d728bf3.tar.gz
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded 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} \