summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2009-06-13 14:29:58 +0100
committerPhil Blundell <philb@gnu.org>2009-06-13 14:29:58 +0100
commit2e4f1691b3e26bf96e7f8f948919a3bba4c088a7 (patch)
treea0ff58f5ce3d4227750fac2ad29f9d1009de9475
parentccbfea17e38f0d4f256c9ed22ea10f4e5df58aec (diff)
tzdata: fix installation with prefix=''
-rw-r--r--recipes/tzdata/tzdata_2007k.bb13
1 files changed, 7 insertions, 6 deletions
diff --git a/recipes/tzdata/tzdata_2007k.bb b/recipes/tzdata/tzdata_2007k.bb
index b1d7d39e55..ed47039d74 100644
--- a/recipes/tzdata/tzdata_2007k.bb
+++ b/recipes/tzdata/tzdata_2007k.bb
@@ -24,24 +24,25 @@ TZONES= "africa antarctica asia australasia europe northamerica southamerica \
CONFFILES_${PN} = "${sysconfdir}/timezone ${sysconfdir}/localtime"
do_compile () {
+ mkdir -p build
for zone in ${TZONES}; do \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo -L /dev/null \
-y ${S}/yearistype.sh ${S}/${zone} ; \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}}/build${datadir}/zoneinfo/posix -L /dev/null \
-y ${S}/yearistype.sh ${S}/${zone} ; \
- ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
+ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \
-y ${S}/yearistype.sh ${S}/${zone} ; \
done
}
do_install () {
- install -d ${D}/usr ${D}${datadir}/zoneinfo
- cp -pPR ${S}/usr ${D}/
+ install -d ${D}${prefix} ${D}${datadir}/zoneinfo
+ cp -pPR ${WORKDIR}/build${prefix}/* ${D}${prefix}
# Install a sane default for timezones
install -d ${D}${sysconfdir}
echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone
- cp -pPR ${S}/usr/share/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime
+ cp -pPR ${WORKDIR}/build${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime
}
# Packages primarily organized by directory with a major city