aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-06-17 18:34:57 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-21 10:36:53 +0200
commitcf2140877b403bec838ac81aeb7b820eee79ee86 (patch)
tree7a68dc5b224dce733f5fe0f8ef3634eeb1f1706f /meta-oe
parentbab22d4b161bdf9c0f69068734c5a3f4adb760b7 (diff)
downloadmeta-openembedded-contrib-cf2140877b403bec838ac81aeb7b820eee79ee86.tar.gz
lcdproc: fix do_install for S!=B
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc5.inc4
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
index d1a45cadcc..91329d8993 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -36,10 +36,10 @@ do_install () {
sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc
# configuration files
- install -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
+ install -m 0644 ${S}/LCDd.conf ${D}${sysconfdir}/LCDd.conf
sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf
sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf
- install -m 0644 clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
+ install -m 0644 ${S}/clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
# driver library files
install -d ${D}${libdir}/lcdproc
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
index 39e607437e..1f9524d074 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
@@ -15,7 +15,7 @@ do_install_append () {
install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
# configuration files
- install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+ install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
}
PACKAGES =+ "lcdvc"