summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-04-04 14:14:10 -0400
committerMike Gilbert <floppym@gentoo.org>2021-04-04 14:15:36 -0400
commit3f1d538050c6e79a6aff7c73a9ceaa2cf8edbe44 (patch)
treea9ddce5092c414c2a07fe3d6c0234aea1d26b87b /sys-apps/ucspi-proxy
parentsys-apps/rng-tools: avoid EROOT in src_install (diff)
downloadgentoo-3f1d538050c6e79a6aff7c73a9ceaa2cf8edbe44.tar.gz
gentoo-3f1d538050c6e79a6aff7c73a9ceaa2cf8edbe44.tar.bz2
gentoo-3f1d538050c6e79a6aff7c73a9ceaa2cf8edbe44.zip
sys-apps/ucspi-proxy: avoid D in src_configure
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps/ucspi-proxy')
-rw-r--r--sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild11
-rw-r--r--sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild11
2 files changed, 16 insertions, 6 deletions
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
index 28b9fea119e4..003533b539b7 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -24,8 +24,13 @@ src_prepare() {
src_configure() {
echo "$(tc-getCC) ${CFLAGS}" > conf-cc
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
- echo "${D}/usr/bin" > conf-bin
- echo "${D}/usr/share/man" > conf-man
+ echo "/usr/bin" > conf-bin
+ echo "/usr/share/man" > conf-man
echo "/usr/include/bglibs" > conf-bgincs
echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
}
+
+src_install() {
+ local -x install_prefix="${D}"
+ default
+}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
index efbc87c02090..05bc1325eda0 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}"
src_configure() {
echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
- echo "${ED}/usr/bin" > conf-bin || die
- echo "${ED}/usr/share/man" > conf-man || die
+ echo "${EPREFIX}/usr/bin" > conf-bin || die
+ echo "${EPREFIX}/usr/share/man" > conf-man || die
+}
+
+src_install() {
+ local -x install_prefix="${D}"
+ default
}