[vlc-commits] contrib: live: Fix 6fbfa484230 for OSX

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jun 19 09:13:37 2012 +0200| [9b53351ce0dfeea15474872b35ec037fdfcb4822] | committer: Rafaël Carré

contrib: live: Fix 6fbfa484230 for OSX

use standard back reference (\1 instead of \0, mach with parens)
use OSX-compatible command line ordering (filenames go at the end)

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

 contrib/src/live555/rules.mak |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index a95ed3d..280816c 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -38,10 +38,10 @@ ifdef HAVE_WINCE
 endif
 	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 -i.orig config.macosx \
-		-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%'
-	cd live && sed -i.orig config.* \
-		-e 's%^COMPILE_OPTS.*$$%\0 '"$(EXTRA_CFLAGS)%"
+	cd live && sed -i.orig \
+		-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' config.macosx
+	cd live && sed -i.orig \
+		-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(EXTRA_CFLAGS)%" config.*
 	cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
 ifdef HAVE_ANDROID
 	cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include%' -i.orig config.linux