[vlc-commits] commit: contribs: fixed libiconv hack on Darwin10 ( Felix Paul Kühne )

[git at videolan.org]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Nov 14 16:41:50 2010 +0100| [e536be03ef35cdd59f4096a9e2e66b0862da1954] | committer: Felix Paul Kühne 

contribs: fixed libiconv hack on Darwin10

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

 extras/contrib/bootstrap   |    2 ++
 extras/contrib/contrib.mak |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index c4893ba..c327467 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -342,6 +342,8 @@ case "$DISTRO" in
 
     case $TARGET in
     x86_64*|i686*) add_enabled_makefile_cfg "HAVE_MACOSX_ON_INTEL" ;;
+    esac
+    case $TARGET in
     *darwin10)     add_enabled_makefile_cfg "HAVE_MACOSX_DARWIN_10" ;;
     *darwin9)      add_enabled_makefile_cfg "HAVE_MACOSX_DARWIN_9" ;;
     esac
diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index 45af547..dc8d36c 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -69,7 +69,7 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
 	(cd build-src && rm -rf *gecko* && $(MAKE) .gecko)
     # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
     # result in linking issues
-ifdef HAVE_DARWIN_10
+ifdef HAVE_MACOSX_DARWIN_10
 	(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
 	(cd build-src && rm -f .iconv && $(MAKE) .iconv)
 endif