From aacd7d945d3eb71802517990caddb596cfcf204f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 21 Feb 2016 13:30:35 -0800 Subject: app-admin/consul: use get_golibdir for library installation Package-Manager: portage-2.2.27 --- app-admin/consul/consul-0.5.2-r1.ebuild | 4 ++-- app-admin/consul/consul-0.6.3.ebuild | 4 ++-- app-admin/consul/consul-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'app-admin/consul') diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild index 57487ede25d6..16987cf44b74 100644 --- a/app-admin/consul/consul-0.5.2-r1.ebuild +++ b/app-admin/consul/consul-0.5.2-r1.ebuild @@ -163,8 +163,8 @@ src_install() { rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} - insinto /usr/lib/go/src/${GO_PN%/*} + insinto "$(get_golibdir)/src/${GO_PN%/*}" doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild index 9b35adb4d534..ea2a455ce86a 100644 --- a/app-admin/consul/consul-0.6.3.ebuild +++ b/app-admin/consul/consul-0.6.3.ebuild @@ -165,8 +165,8 @@ src_install() { rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} - insinto /usr/lib/go/src/${GO_PN%/*} + insinto "$(get_golibdir)/src/${GO_PN%/*}" doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild index f6d1b09295e5..0e865fe8e4c0 100644 --- a/app-admin/consul/consul-9999.ebuild +++ b/app-admin/consul/consul-9999.ebuild @@ -118,8 +118,8 @@ src_install() { rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} - insinto /usr/lib/go/src/${GO_PN%/*} + insinto "$(get_golibdir)/src/${GO_PN%/*}" doins -r "${WORKDIR}"/src/${GO_PN} } -- cgit v1.2.3-65-gdbad