[vlc-commits] contrib: live555: don't match just 'ar'

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan 24 22:43:07 2012 -0500| [d7da94f8e42fe96e7dedb7062af82e5efe2d514c] | committer: Rafaël Carré

contrib: live555: don't match just 'ar'

It would replace the 'ar' of 'arm-....'
Instead use "LIBRARY_LINK =.*ar" to be sure we replace the correct tool
(cherry picked from commit 2a8e01dda3d9bcf9328623bdb2194f2d4c2d9c17)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d7da94f8e42fe96e7dedb7062af82e5efe2d514c
---

 contrib/src/live555/rules.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index bc23cf1..ebc1b22 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -32,7 +32,7 @@ live555: $(LIVE555_FILE) .sum-live555
 ifdef HAVE_WINCE
 	cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
 endif
-	cd live && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -e 's%ar%$(AR)%' -i.orig config.$(LIVE_TARGET)
+	cd live && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -e 's%LIBRARY_LINK =.*ar%LIBRARY_LINK = $(AR)%' -i.orig config.$(LIVE_TARGET)
 	cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
 	cd live && sed \
 		-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \