summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2021-08-04 12:10:59 +0200
committerUlrich Müller <ulm@gentoo.org>2021-08-04 12:10:59 +0200
commit140aac7de90b44e7a14b4f5aaf5952911ad074ea (patch)
tree19d7fbe6aa6daebf8dd74e650173fd5096c91a8b
parentebuild-env-vars.tex: Fix a reference (diff)
downloadpms-140aac7de90b44e7a14b4f5aaf5952911ad074ea.tar.gz
pms-140aac7de90b44e7a14b4f5aaf5952911ad074ea.tar.bz2
pms-140aac7de90b44e7a14b4f5aaf5952911ad074ea.zip
pkg-mgr-commands.tex: Fix econf --libdir logic
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 <ulm@gentoo.org>
-rw-r--r--pkg-mgr-commands.tex4
1 files changed, 3 insertions, 1 deletions
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=