diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-02-05 12:54:12 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-02-05 12:54:12 +0000 |
| commit | ba1f922665354b80da5e8636097cafaa7b2f91ee (patch) | |
| tree | 22d8ce41863a9d0a0fc726b4d1f6f1b758b80771 | |
| parent | aafc19e52f4331103d00fcd33fa425168137ce27 (diff) | |
opie-ttf-support: add 02qtttffont-update and move everything possible from the bb file there
* improves readability and robustness
* closes 3720 together with e25947a6e6d2be708fd836b7d5209a3d074a28a5 from xjqian
| -rw-r--r-- | packages/opie-ttf-support/files/02qtttffont-update | 6 | ||||
| -rw-r--r-- | packages/opie-ttf-support/opie-ttf-support_1.1.bb | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/packages/opie-ttf-support/files/02qtttffont-update b/packages/opie-ttf-support/files/02qtttffont-update new file mode 100644 index 0000000000..8f8058faea --- /dev/null +++ b/packages/opie-ttf-support/files/02qtttffont-update @@ -0,0 +1,6 @@ +#!/bin/sh +# Author: Rolf Leggewie + +mkdir -p @@PALMTOPDIR@@/lib/fonts + +@@SBINDIR@@/update-qtttffontdir @@DATADIR@@/fonts/truetype > @@PALMTOPDIR@@/lib/fonts/fontdir 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 c6ed53ffbd..18ce7ac0c9 100644 --- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb +++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Meta-package for Opie TTF support" SECTION = "opie/fonts" DEPENDS = "freetype" -PR = "r4" +PR = "r5" -SRC_URI = "file://update-qtttffontdir.c" +SRC_URI = "file://update-qtttffontdir.c \ + file://02qtttffont-update" S = "${WORKDIR}" do_compile() { @@ -11,23 +12,15 @@ do_compile() { } do_install() { - - echo " -#!/bin/sh -# Author: Rolf Leggewie - -${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype > ${palmtopdir}/lib/fonts/fontdir -" > ${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/ + sed -i 's!@@SBINDIR@@!${sbindir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update + sed -i 's!@@PALMTOPDIR@@!${palmtopdir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update + sed -i 's!@@DATADIR@@!${datadir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update } pkg_postinst() { - if ! [ -d ${palmtopdir}/lib/fonts ]; then - mkdir -p ${palmtopdir}/lib/fonts - fi ${sysconfdir}/update-fonts-common.d/02qtttffont-update } |