From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 86AE758973 for ; Fri, 22 Jan 2016 03:15:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3E3821C027; Fri, 22 Jan 2016 03:15:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 734DF21C021 for ; Fri, 22 Jan 2016 03:15:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A044334094F for ; Fri, 22 Jan 2016 03:15:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 751641021 for ; Fri, 22 Jan 2016 03:15:43 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1453420832.bd79e633184e446b6e0985e80539dd7ce6c81a62.mjo@gentoo> Subject: [gentoo-commits] proj/eselect-php:master commit in: src/ X-VCS-Repository: proj/eselect-php X-VCS-Files: src/php.eselect.in.in X-VCS-Directories: src/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: bd79e633184e446b6e0985e80539dd7ce6c81a62 X-VCS-Branch: master Date: Fri, 22 Jan 2016 03:15:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9027fda2-ff90-404e-8b45-e4341795ab45 X-Archives-Hash: d698a19ad8954587e7faddc2b011b6b7 commit: bd79e633184e446b6e0985e80539dd7ce6c81a62 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 00:00:32 2016 +0000 Commit: Michael Orlitzky gentoo 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 }