public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/bibutils/
Date: Wed, 25 Aug 2021 02:30:42 +0000 (UTC)	[thread overview]
Message-ID: <1629858590.d863ed8f66a3419d033d6afbaaa471d65c0365c7.sam@gentoo> (raw)

commit:     d863ed8f66a3419d033d6afbaaa471d65c0365c7
Author:     Matt Smith <matt <AT> offtopica <DOT> uk>
AuthorDate: Sat Aug 21 17:02:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 25 02:29:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d863ed8f

app-text/bibutils: Don't use $ED in src_configure

Quickly patch build system so that destdir can be set at install time.

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Matt Smith <matt <AT> offtopica.uk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/bibutils/bibutils-6.10.ebuild | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
index fb3e20024c4..9b7f812f98c 100644
--- a/app-text/bibutils/bibutils-6.10.ebuild
+++ b/app-text/bibutils/bibutils-6.10.ebuild
@@ -16,11 +16,17 @@ KEYWORDS="amd64 ~ppc ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+	sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
+	sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
+}
+
 src_configure() {
 	./configure \
-		--dynamic \
-		--install-dir "${ED}/usr/bin" \
-		--install-lib "${ED}/usr/$(get_libdir)" || die
+		--install-dir /usr/bin \
+		--install-lib /usr/$(get_libdir) \
+		--dynamic || die
 }
 
 src_compile() {
@@ -36,3 +42,7 @@ src_test() {
 		DISTRO_CFLAGS="${CFLAGS}" \
 		LDFLAGSIN="${LDFLAGS}" test
 }
+
+src_install() {
+	emake DESTDIR="${ED}" install
+}


             reply	other threads:[~2021-08-25  2:30 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-25  2:30 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-03  7:12 [gentoo-commits] repo/gentoo:master commit in: app-text/bibutils/ Jakov Smolić
2021-11-03  0:03 Sam James
2021-10-01  7:24 Jakov Smolić
2021-04-25 11:50 David Seifert
2021-04-25 11:50 David Seifert
2021-04-25  5:09 Sam James
2021-02-17  9:37 David Seifert
2019-12-20  8:51 Andreas K. Hüttel
2019-01-17 21:48 Andreas K. Hüttel
2019-01-11 21:23 Andreas K. Hüttel
2017-02-18  9:54 David Seifert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1629858590.d863ed8f66a3419d033d6afbaaa471d65c0365c7.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox