Patchwork bind: adjust hardcoded install path references

login
register
mail settings
Submitter Phil Blundell
Date June 15, 2011, 2:26 p.m.
Message ID <1308147966.25285.1758.camel@phil-desktop>
Download mbox | patch
Permalink /patch/5983/
State New, archived
Headers show

Comments

Phil Blundell - June 15, 2011, 2:26 p.m.
Fixes do_install() on micro, which otherwise fails for obvious reasons.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-connectivity/bind/bind_9.7.2-P3.bb |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
Richard Purdie - June 15, 2011, 2:28 p.m.
On Wed, 2011-06-15 at 15:26 +0100, Phil Blundell wrote:
> Fixes do_install() on micro, which otherwise fails for obvious reasons.
> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  meta/recipes-connectivity/bind/bind_9.7.2-P3.bb |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb b/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
index 4094aeb..e3089bb 100644
--- a/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
@@ -35,11 +35,11 @@  FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
 
 do_install_append() {
-	rm "${D}/usr/bin/nslookup"
-	install -d "${D}/etc/bind"
-	install -d "${D}/etc/init.d"
-	install -m 644 ${S}/conf/* "${D}/etc/bind"
-	install -m 755 "${S}/init.d" "${D}/etc/init.d/bind"
+	rm "${D}${bindir}/nslookup"
+	install -d "${D}${sysconfdir}/bind"
+	install -d "${D}${sysconfdir}/init.d"
+	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
+	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
 }
 
 CONFFILES_${PN} = " \