summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2016-01-21 19:00:32 -0500
committerMichael Orlitzky <mjo@gentoo.org>2016-01-21 19:00:32 -0500
commitbd79e633184e446b6e0985e80539dd7ce6c81a62 (patch)
tree292e3cd46d42d7a8de47608b0b2df681778d8432
parentAdd another layer of indirection to get @bindir@ and friends in the output. (diff)
downloadeselect-php-bd79e633184e446b6e0985e80539dd7ce6c81a62.tar.gz
eselect-php-bd79e633184e446b6e0985e80539dd7ce6c81a62.tar.bz2
eselect-php-bd79e633184e446b6e0985e80539dd7ce6c81a62.zip
Replace custom bindir handling with the new autotools magic.
As a first test of the new directory substitution, replace one instance of custom bindir handling. Use @bindir@ instead of "${EROOT}/usr/bin" sapi_active_link_dir(). The results should coincide when configured with, ./configure --bindir="${EROOT}"/usr/bin
-rw-r--r--src/php.eselect.in.in9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in
index b2a0dd5..e24cd39 100644
--- a/src/php.eselect.in.in
+++ b/src/php.eselect.in.in
@@ -114,14 +114,13 @@ sapi_active_link_target_dir() {
#
sapi_active_link_dir() {
local sapi="${1}"
- local bin_dir="${EROOT}/usr/bin"
case "${sapi}" in
apache2) echo "${EROOT}$(get_active_libdir)/apache2/modules" ;;
- cli) echo "${bin_dir}" ;;
- fpm) echo "${bin_dir}" ;;
- cgi) echo "${bin_dir}" ;;
- phpdbg) echo "${bin_dir}" ;;
+ cli) echo "@bindir@" ;;
+ fpm) echo "@bindir@" ;;
+ cgi) echo "@bindir@" ;;
+ phpdbg) echo "@bindir@" ;;
*) die "invalid SAPI name: ${sapi}" ;;
esac
}