mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-21 01:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not pass $INSTALL via TESTS_ENVIRONMENT.

Browse Source 
* 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>
This commit is contained in:
Ralf Wildenhues 2009-02-16 21:59:34 +01:00
parent 77e1149984
commit 9e9ba5e0e2
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

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

2
Makefile.am
View File

@ -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)" \

4
tests/install.at
View File

@ -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])

6
tests/testsuite.at
View File

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