diff options
| author | Damien Miller <djm@mindrot.org> | 2012-07-06 11:49:28 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2012-07-06 11:49:28 +1000 |
| commit | 77eab7b0240683eea307332e1df3ff8920baf012 (patch) | |
| tree | a740049a8463a9f03de2bf28d979fae466bc6e88 /configure.ac | |
| parent | a0433a7096b7f1f5d7332b04fa83660b3208ab1d (diff) | |
| download | openssh-git-77eab7b0240683eea307332e1df3ff8920baf012.tar.gz | |
- (djm) [configure.ac] Recursively expand $(bindir) to ensure it has no
unexpanded $(prefix) embedded. bz#2007 patch from nix-corp AT
esperi.org.uk; ok dtucker@
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index da919a63..a704fc7f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.495 2012/07/03 22:50:10 dtucker Exp $ +# $Id: configure.ac,v 1.496 2012/07/06 01:49:29 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.495 $) +AC_REVISION($Revision: 1.496 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -4005,13 +4005,16 @@ otherwise scp will not work.]) [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ] ) # make sure $bindir is in USER_PATH so scp will work - t_bindir=`eval echo ${bindir}` - case $t_bindir in - NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;; - esac - case $t_bindir in - NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;; - esac + t_bindir="${bindir}" + while echo "${t_bindir}" | egrep '\$\{|NONE/' >/dev/null 2>&1; do + t_bindir=`eval echo ${t_bindir}` + case $t_bindir in + NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;; + esac + case $t_bindir in + NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;; + esac + done echo $user_path | grep ":$t_bindir" > /dev/null 2>&1 if test $? -ne 0 ; then echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 |