qt4.inc: Work with DISTRO=micro where local_prefix is ""
authorHolger Hans Peter Freyther <zecke@selfish.org>
Sat, 11 Jul 2009 21:30:38 +0000 (23:30 +0200)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Sat, 11 Jul 2009 21:39:28 +0000 (23:39 +0200)
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

index 427bbae..42e2726 100644 (file)
@@ -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} \