Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/bibutils/
Date: Wed, 25 Aug 2021 02:30:47
Message-Id: 1629858590.d863ed8f66a3419d033d6afbaaa471d65c0365c7.sam@gentoo
1 commit: d863ed8f66a3419d033d6afbaaa471d65c0365c7
2 Author: Matt Smith <matt <AT> offtopica <DOT> uk>
3 AuthorDate: Sat Aug 21 17:02:57 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 25 02:29:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d863ed8f
7
8 app-text/bibutils: Don't use $ED in src_configure
9
10 Quickly patch build system so that destdir can be set at install time.
11
12 Package-Manager: Portage-3.0.22, Repoman-3.0.3
13 Signed-off-by: Matt Smith <matt <AT> offtopica.uk>
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 app-text/bibutils/bibutils-6.10.ebuild | 16 +++++++++++++---
17 1 file changed, 13 insertions(+), 3 deletions(-)
18
19 diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
20 index fb3e20024c4..9b7f812f98c 100644
21 --- a/app-text/bibutils/bibutils-6.10.ebuild
22 +++ b/app-text/bibutils/bibutils-6.10.ebuild
23 @@ -16,11 +16,17 @@ KEYWORDS="amd64 ~ppc ~x86"
24
25 S="${WORKDIR}/${MY_P}"
26
27 +src_prepare() {
28 + default
29 + sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
30 + sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
31 +}
32 +
33 src_configure() {
34 ./configure \
35 - --dynamic \
36 - --install-dir "${ED}/usr/bin" \
37 - --install-lib "${ED}/usr/$(get_libdir)" || die
38 + --install-dir /usr/bin \
39 + --install-lib /usr/$(get_libdir) \
40 + --dynamic || die
41 }
42
43 src_compile() {
44 @@ -36,3 +42,7 @@ src_test() {
45 DISTRO_CFLAGS="${CFLAGS}" \
46 LDFLAGSIN="${LDFLAGS}" test
47 }
48 +
49 +src_install() {
50 + emake DESTDIR="${ED}" install
51 +}