- (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@

2 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 771ba79c2..63045f048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
  - (djm) [sandbox-seccomp-filter.c] fallback to rlimit if seccomp filter is
    not available. Allows use of sshd compiled on host with a filter-capable
    kernel on hosts that lack the support. bz#2011 ok dtucker@
+ - (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@
 
 20120704
  - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] Add setlinebuf for
diff --git a/configure.ac b/configure.ac
index da919a636..a704fc7ff 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