From 9e9ba5e0e2c0b3f33ee44081c5bc3f0b8991aebd Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 16 Feb 2009 21:59:34 +0100
Subject: [PATCH] Do not pass $INSTALL via TESTS_ENVIRONMENT.

* Makefile.am (TESTS_ENVIRONMENT): Set lt_INSTALL, not INSTALL,
so that a bogus relative path to the install-sh script in the
source tree is not propagated to the configure scripts of the
old test suite.
* tests/testsuite.at: Adjust.
* tests/install.at (Install tests): Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
 ChangeLog          | 10 ++++++++++
 Makefile.am        |  2 +-
 tests/install.at   |  4 ++--
 tests/testsuite.at |  6 +++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5fe54d77..08aeff17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-02-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Do not pass $INSTALL via TESTS_ENVIRONMENT.
+	* Makefile.am (TESTS_ENVIRONMENT): Set lt_INSTALL, not INSTALL,
+	so that a bogus relative path to the install-sh script in the
+	source tree is not propagated to the configure scripts of the
+	old test suite.
+	* tests/testsuite.at: Adjust.
+	* tests/install.at (Install tests): Likewise.
+
 2009-02-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 	    Kurt Roeckx <kurt@roeckx.be>
 
diff --git a/Makefile.am b/Makefile.am
index 574147d1..c49f7499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -501,7 +501,7 @@ EXTRA_DIST     += $(srcdir)/$(TESTSUITE) $(TESTSUITE_AT) $(srcdir)/tests/package
 TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
 	CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
 	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-	STRIP="$(STRIP)" INSTALL="$(INSTALL)" \
+	STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
 	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
 	SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
 	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
diff --git a/tests/install.at b/tests/install.at
index 1e944e51..5e155558 100644
--- a/tests/install.at
+++ b/tests/install.at
@@ -41,10 +41,10 @@ echo 'int a () { return 0; }' > a.c
 $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo ]dnl
 	 [-rpath $inst -no-undefined], [], [ignore], [ignore])
-AT_CHECK([$LIBTOOL --mode=install $INSTALL liba.la $inst],
+AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL liba.la $inst],
 	 [], [stdout], [ignore])
 AT_CHECK([grep ' -m 755' stdout], [], [ignore])
-AT_CHECK([$LIBTOOL --mode=install $INSTALL -m 644 liba.la $inst],
+AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL -m 644 liba.la $inst],
 	 [], [stdout], [ignore])
 AT_CHECK([grep ' -m 755' stdout], [], [ignore])
 AT_CHECK([grep ' -m 644.*liba.la' stdout], [], [ignore])
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 09298499..e9226eee 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -52,10 +52,10 @@ else
   unset=false
 fi
 : ${mkdir_p="$abs_top_srcdir/libltdl/config/install-sh -d"}
-# Fix relative paths in $INSTALL
-case $INSTALL in
+# Fix relative paths in $lt_INSTALL
+case $lt_INSTALL in
   *libltdl/config/install-sh*)
-    INSTALL=$abs_top_srcdir/libltdl/config/install-sh
+    lt_INSTALL=$abs_top_srcdir/libltdl/config/install-sh
     ;;
 esac