summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krelin <hacker@klever.net>2007-07-07 22:22:23 +0000
committerMichael Krelin <hacker@klever.net>2007-07-07 22:22:23 +0000
commit69192879af76d958de92cbfd41505c339298a711 (patch)
tree30eaae8edbb4adb23b61c5a322ce1fd264230608
parentc3d32cc108b6ad1a02aed24fd155d19107899b20 (diff)
qpf-font-common: fonts aren't in /opt/QtPalmtop anymore
-rwxr-xr-xpackages/qpf-fonts/files/update-qtfontdir2
-rw-r--r--packages/qpf-fonts/qpf-font-common_1.0.bb3
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/qpf-fonts/files/update-qtfontdir b/packages/qpf-fonts/files/update-qtfontdir
index 857dc6c0d5..34f2ffd825 100755
--- 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 306fa22201..41bdad0a4a 100644
--- 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
}