>From 88e09c231280f39803dbb05583b51c6e04e41c17 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Mon, 4 Nov 2013 23:01:27 +0000
Subject: [PATCH] tests: fix spurious failure when install-sh is used
 (bug#14891)

Signed-off-by: Stefano Lattarini <address@hidden>
---
 t/instmany.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/t/instmany.sh b/t/instmany.sh
index 0a479cc..925527b 100644
--- a/t/instmany.sh
+++ b/t/instmany.sh
@@ -81,7 +81,15 @@ END
 chmod +x x-bin/'rm' x-bin/my-install
 
 cat > setenv.in <<'END'
-orig_INSTALL='@INSTALL@'; export orig_INSTALL
+# When the install-sh is selected, $INSTALL is defined as a relative
+# path.  Since we might chdir around, we have to rewrite it to be an
+# absolute path.  See autmake bug#14891.
+orig_INSTALL='@INSTALL@'
+case $orig_INSTALL in
+  /*) ;;
+  */*) orig_INSTALL=`pwd`/$orig_INSTALL
+esac
+export orig_INSTALL
 END
 
 cat >>configure.ac <<END
-- 
1.8.5.rc0.23.gaa27064