aboutsummaryrefslogtreecommitdiffstats
path: root/apmd
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-03-23 07:21:43 +0000
committerChris Larson <clarson@kergoth.com>2004-03-23 07:21:43 +0000
commit2e27e66f278d776dbce5a7733d6db63c90a7df9e (patch)
tree4901cbd3a9e3c3c3da3b6da2cd8e3f4aea1821c6 /apmd
parentf249735ad71fd5f13bfd295c55e1e0d596a1dbff (diff)
downloadopenembedded-2e27e66f278d776dbce5a7733d6db63c90a7df9e.tar.gz
cleanup: replace some last manual lib install+symlink with calls to oe_soinstall.
BKrev: 405fe587cQlZLeatBrb4J3NSLsbEqQ
Diffstat (limited to 'apmd')
-rw-r--r--apmd/apmd_3.2.0.oe62
1 files changed, 30 insertions, 32 deletions
diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index a4ca3cd42a..6224f4ae06 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -18,45 +18,43 @@ S = "${WORKDIR}/apmd-${PV}.orig"
inherit libtool
do_compile() {
- if [ -e ${STAGING_BINDIR}/${TARGET_SYS}-libtool ]; then
- LIBTOOL=${STAGING_BINDIR}/${TARGET_SYS}-libtool
- else
- LIBTOOL=libtool
- fi
- oe_runmake "LIBTOOL=$LIBTOOL" apm apmd
+ if [ -e ${STAGING_BINDIR}/${TARGET_SYS}-libtool ]; then
+ LIBTOOL=${STAGING_BINDIR}/${TARGET_SYS}-libtool
+ else
+ LIBTOOL=libtool
+ fi
+ oe_runmake "LIBTOOL=$LIBTOOL" apm apmd
}
do_stage() {
- install -m 0755 .libs/libapm.so.1.0.0 ${STAGING_LIBDIR};
+ oe_soinstall .libs/libapm.so.1.0.0 ${STAGING_LIBDIR}/
}
do_install() {
- install -d ${D}/${sysconfdir}
- install -d ${D}/${sysconfdir}/apm
- install -d ${D}/${sysconfdir}/apm/event.d
- install -d ${D}/${sysconfdir}/apm/other.d
- install -d ${D}/${sysconfdir}/apm/suspend.d
- install -d ${D}/${sysconfdir}/apm/resume.d
- install -d ${D}/${sysconfdir}/apm/scripts.d
- install -d ${D}/${sysconfdir}/default
- install -d ${D}/${sysconfdir}/init.d
- install -d ${D}/${sbindir}
- install -d ${D}/${bindir}
- install -d ${D}/${libdir}
- install -d ${D}/${datadir}/apmd
- install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig
- install -m 0755 ${FILESDIR}/apmwrapper ${D}/${bindir}/apm
- install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd
- install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/
- install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
- install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
- install -m 0755 .libs/libapm.so.1.0.0 ${D}/${libdir}
- ln -sf ./libapm.so.1.0.0 ${D}/${libdir}/libapm.so.1.0
- ln -sf ./libapm.so.1.0.0 ${D}/${libdir}/libapm.so.1
-
- cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd
- chmod 755 ${D}/${sysconfdir}/init.d/apmd
+ install -d ${D}/${sysconfdir}
+ install -d ${D}/${sysconfdir}/apm
+ install -d ${D}/${sysconfdir}/apm/event.d
+ install -d ${D}/${sysconfdir}/apm/other.d
+ install -d ${D}/${sysconfdir}/apm/suspend.d
+ install -d ${D}/${sysconfdir}/apm/resume.d
+ install -d ${D}/${sysconfdir}/apm/scripts.d
+ install -d ${D}/${sysconfdir}/default
+ install -d ${D}/${sysconfdir}/init.d
+ install -d ${D}/${sbindir}
+ install -d ${D}/${bindir}
+ install -d ${D}/${libdir}
+ install -d ${D}/${datadir}/apmd
+ install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig
+ install -m 0755 ${FILESDIR}/apmwrapper ${D}/${bindir}/apm
+ install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd
+ install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/
+ install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
+ install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
+ oe_soinstall .libs/libapm.so.1.0.0 ${D}/${libdir}/
+
+ cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd
+ chmod 755 ${D}/${sysconfdir}/init.d/apmd
}
pkg_postinst () {