qpf-font-common: fonts aren't in /opt/QtPalmtop anymore

diff --git a/packages/qpf-fonts/files/update-qtfontdir b/packages/qpf-fonts/files/update-qtfontdir
index 857dc6c..34f2ffd 100755 (executable)
--- a/packages/qpf-fonts/files/update-qtfontdir
+++ b/packages/qpf-fonts/files/update-qtfontdir
@@ -41,7 +41,7 @@ if [ -z "$1" ]; then
        if [ -n "$QTDIR" ]; then
                fontdir=$QTDIR/lib/fonts
        else
-               fontdir=/opt/QtPalmtop/lib/fonts
+               fontdir=@palmtopdir@/lib/fonts
        fi
 else
        fontdir=$1

diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb
index 306fa22..41bdad0 100644 (file)
--- a/packages/qpf-fonts/qpf-font-common_1.0.bb
+++ b/packages/qpf-fonts/qpf-font-common_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt/Embedded Fonts Common Files"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://update-qtfontdir"
 S = "${WORKDIR}/qt-${PV}"
@@ -10,4 +10,5 @@ S = "${WORKDIR}/qt-${PV}"
 do_install() {
        install -d ${D}${sbindir}/
        install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/
+       sed -i -e 's,@palmtopdir@,${palmtopdir},g' ${D}${sbindir}/update-qtfontdir
 }