From c66ca9c303bb6078b513c6b0f528667da74396ee Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 13 Jan 2004 17:12:50 +0000
Subject: Merge
 direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/paths into
 direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages

2004/01/13 11:10:14-06:00 ti.com!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/paths

2004/01/13 10:56:32-06:00 ti.com!kergoth
Remove hardcoded references to target paths in a number of packages, replacing them with the use of our target path variables.

2004/01/13 17:40:06+01:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/oe-packages

2004/01/13 14:24:53+01:00 uni-frankfurt.de!mickeyl
add pyserial and sgmlop to buildsystem

BKrev: 40042712PUToOUzefh1XdY4q23VfEA
---
 apmd/apmd_3.2.0.oe | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'apmd')

diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index e76e4dd028..07ac0799ae 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -43,13 +43,12 @@ do_install() {
     install -d ${D}/${sbindir}
     install -d ${D}/${bindir}
     install -d ${D}/${libdir}
-    install -d ${D}/usr/share
-    install -d ${D}/usr/share/apmd
+    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}/usr/share/apmd/
+    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
-- 
cgit v1.2.3