[oe-commits] Holger Hans Peter Freyther : qt4.inc: Work with DISTRO= micro where local_prefix is ""

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: db52e94cc14b3a4c53ca5ec4c3817e4fc12f5985
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=db52e94cc14b3a4c53ca5ec4c3817e4fc12f5985

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Sat Jul 11 23:30:38 2009 +0200

qt4.inc: Work with DISTRO=micro where local_prefix is ""

The Qt buildsystem does not like when the -prefix is omitted
(""). Append a "/" to the ${prefix} to always have at least
one charachter. This was build tested with the micro and minimal
distribution.

---

 recipes/qt4/qt4.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 427bbae..42e2726 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} \