From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1315426-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 12F3E1580B9
for <garchives@archives.gentoo.org>; Wed, 25 Aug 2021 02:30:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 16DF2E0869;
Wed, 25 Aug 2021 02:30:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BE10FE086B
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Aug 2021 02:30:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 76014342A82
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Aug 2021 02:30:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DB25086D
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Aug 2021 02:30:42 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1629858590.d863ed8f66a3419d033d6afbaaa471d65c0365c7.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/bibutils/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-text/bibutils/bibutils-6.10.ebuild
X-VCS-Directories: app-text/bibutils/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d863ed8f66a3419d033d6afbaaa471d65c0365c7
X-VCS-Branch: master
Date: Wed, 25 Aug 2021 02:30:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c27940de-e161-44d2-992b-878bd91aea00
X-Archives-Hash: 45d1875bb2291949be046e0c16bca1b8
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
+}