From 95362ad151d2bc200f0627ab1f905a987127e5a3 Mon Sep 17 00:00:00 2001 From: Stefan Muenzel Date: Sat, 2 May 2015 17:31:07 +0800 Subject: [PATCH] sys-apps/netctl-1.9: Update to multiarch Change-Id: I0f167eb2f1777679b15c81a37efa215d4259b387 --- packages/sys-apps/netctl/netctl-1.9.exheres-0 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/sys-apps/netctl/netctl-1.9.exheres-0 b/packages/sys-apps/netctl/netctl-1.9.exheres-0 index 6f99bbc..af9a26b 100644 --- a/packages/sys-apps/netctl/netctl-1.9.exheres-0 +++ b/packages/sys-apps/netctl/netctl-1.9.exheres-0 @@ -22,7 +22,14 @@ DEPENDENCIES=" sys-apps/dialog virtual/dhcp-client " -DEFAULT_SRC_INSTALL_PARAMS+=( DESTDIR="${IMAGE}" ) + +src_prepare() { + default + LIBDIR=/usr/$(exhost --target)/lib + BINDIR=/usr/$(exhost --target)/bin + edo sed -e "s#/usr/lib#${LIBDIR}#" -i Makefile + edo sed -e "s#/usr/bin#${BINDIR}#" -i Makefile +} src_compile() { # nothing to do @@ -32,12 +39,6 @@ src_compile() { src_install() { default - if [ "lib64" = "${LIBDIR}" ] - then - edo mv "${IMAGE}/usr/lib/"* "${IMAGE}/usr/lib64" - edo rmdir "${IMAGE}/usr/lib/" - fi - keepdir /etc/netctl/interfaces keepdir /etc/netctl/hooks }