merge of '19595382c19aadeee7dac4939deb285a05e428eb'

     and '31ced983465ce39a8b2be69de54096ba17a8b404'

1 files changed, 16 insertions, 6 deletions

diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index d11d8ea75f..c6ed53ffbd 100644
--- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,23 +1,33 @@
 DESCRIPTION = "Meta-package for Opie TTF support"
 SECTION = "opie/fonts"
 DEPENDS = "freetype"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://update-qtttffontdir.c"
 S = "${WORKDIR}"
 
 do_compile() {
-	${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c
+        ${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c
 }
 
 do_install() {
-	install -d ${D}${sbindir}
-	install -d ${D}${sysconfdir}/update-fonts-common.d/
-	install -m 0755 update-qtttffontdir ${D}${sbindir}
+
         echo "
 #!/bin/sh
 # Author: Rolf Leggewie
 
 ${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype > ${palmtopdir}/lib/fonts/fontdir
-" > ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
+" > ${WORKDIR}/02qtttffont-update
+
+        install -d ${D}${sbindir}
+        install -d ${D}${sysconfdir}/update-fonts-common.d/
+        install -m 0755 update-qtttffontdir ${D}${sbindir}
+        install -m 0755 02qtttffont-update ${D}${sysconfdir}/update-fonts-common.d/
+}
+
+pkg_postinst() {
+        if ! [ -d ${palmtopdir}/lib/fonts ]; then
+            mkdir -p ${palmtopdir}/lib/fonts
+        fi
+        ${sysconfdir}/update-fonts-common.d/02qtttffont-update
 }