[gentoo-commits] proj/eselect-php:master commit in: src/

[Michael Orlitzky]

commit:     bd79e633184e446b6e0985e80539dd7ce6c81a62
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 00:00:32 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 00:00:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=bd79e633

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

 src/php.eselect.in.in | 9 ++++-----
 1 file 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
 }