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>

diff --git a/ChangeLog b/ChangeLog
index 5fe54d770603892fc0ba6c4e33df721f37052e05..08aeff177388ee5b846c3fa0e3b54e1fbef83def 100644 (file)
--- 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 574147d133544ed7a62b7ae044203347901414a4..c49f7499a89ab3b999ae56c98c657fbe5b7db248 100644 (file)
--- 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 1e944e5113675027c0bd1964486e09ca0a1cc9cd..5e1555588385f32799bfbf62a2d1ec92f46ee809 100644 (file)
--- 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 0929849993cadc6b98a6e3bf030a72e181f3e6dc..e9226eee14cf8014e0e32a817837f3341751c7a1 100644 (file)
--- 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