From 140aac7de90b44e7a14b4f5aaf5952911ad074ea Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Wed, 4 Aug 2021 12:10:59 +0200 Subject: pkg-mgr-commands.tex: Fix econf --libdir logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Portage uses both --exec-prefix and --prefix in its econf logic, introduced in 2005: https://gitweb.gentoo.org/archive/proj/portage-cvs.git/commit/?h=portage_2_0&id=865508e5cb2fd3e6ef7c312b6a7bb88cf8799f9c Pkgcore agrees with Portage. Paludis uses --prefix first, then --exec-prefix. Closes: https://bugs.gentoo.org/806374 Signed-off-by: Ulrich Müller --- pkg-mgr-commands.tex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index 0a34db9..4431435 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -386,7 +386,9 @@ commands once the current phase function has returned. \caption{\t{econf -{}-libdir} logic} \label{alg:econf-libdir} \begin{algorithmic}[1] \STATE let prefix=\$\{EPREFIX\}/usr -\IF{the caller specified -{}-prefix=\$p} +\IF{the caller specified -{}-exec-prefix=\$ep} + \STATE let prefix=\$ep +\ELSIF{the caller specified -{}-prefix=\$p} \STATE let prefix=\$p \ENDIF \STATE let libdir= -- cgit v1.2.3-18-g5258