summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2016-02-21 13:30:35 -0800
committerZac Medico <zmedico@gentoo.org>2016-02-21 13:37:30 -0800
commitaacd7d945d3eb71802517990caddb596cfcf204f (patch)
treec17592f76e024a7776529ab35f7ebdca05781e91 /app-admin/consul
parentsys-apps/xinetd: adjust init script license (diff)
downloadgentoo-aacd7d945d3eb71802517990caddb596cfcf204f.tar.gz
gentoo-aacd7d945d3eb71802517990caddb596cfcf204f.tar.bz2
gentoo-aacd7d945d3eb71802517990caddb596cfcf204f.zip
app-admin/consul: use get_golibdir for library installation
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-admin/consul')
-rw-r--r--app-admin/consul/consul-0.5.2-r1.ebuild4
-rw-r--r--app-admin/consul/consul-0.6.3.ebuild4
-rw-r--r--app-admin/consul/consul-9999.ebuild4
3 files changed, 6 insertions, 6 deletions
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}
}