[vlc-commits] contrib: live555: use armlinux config when building for arm

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan 19 16:58:41 2012 -0500| [106bcbd094a37754df1c688ee38dcccc2ebaf783] | committer: Jean-Baptiste Kempf

contrib: live555: use armlinux config when building for arm
(cherry picked from commit 4135148ba02495d59c01e190843bf2cc647c7ef1)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=106bcbd094a37754df1c688ee38dcccc2ebaf783
---

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

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index a358b09..9997fc8 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -20,8 +20,12 @@ live555: $(LIVE555_FILE) .sum-live555
 
 LIVE_TARGET = $(error live555 target not defined!)
 ifdef HAVE_LINUX
+ifeq ($(ARCH),arm)
+LIVE_TARGET := armlinux
+else
 LIVE_TARGET := linux
 endif
+endif
 ifdef HAVE_WIN32
 LIVE_TARGET := mingw
 endif