From: Peter Rosin <peda@lysator.liu.se>
Date: Wed, 18 Mar 2009 21:47:14 +0000 (+0100)
Subject: Merge branch 'master' into pr-msvc-support
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89103f4b11a3743dec1bfbdefd16269a19dc5377;p=thirdparty%2Flibtool.git

Merge branch 'master' into pr-msvc-support
---

89103f4b11a3743dec1bfbdefd16269a19dc5377
diff --cc Makefile.am
index b30884b72,c49f7499a..cdd6984d6
--- a/Makefile.am
+++ b/Makefile.am
@@@ -500,9 -501,7 +503,9 @@@ EXTRA_DIST     += $(srcdir)/$(TESTSUITE
  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)" \
 +	AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
 +	LT_AR="$(LT_AR)" LT_ARFLAGS="$(LT_ARFLAGS)" \
- 	STRIP="$(STRIP)" INSTALL="$(INSTALL)" \
+ 	STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
  	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
  	SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
  	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \