[vlc-commits] commit: contrib: .iconv->.iconv-from-os when appropriate. (Pierre d' Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Wed Nov 17 19:47:41 2010 +0100| [03916eb00733a01a938b9796c2bf52781832ccd9] | committer: Pierre d'Herbemont 

contrib: .iconv->.iconv-from-os when appropriate.

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

 extras/contrib/contrib.mak         |    2 +-
 extras/contrib/src/contrib-src.mak |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index dcbe5cf..bae3db4 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -72,7 +72,7 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
     # result in linking issues
 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)
+	(cd build-src && rm -f .iconv && $(MAKE) .iconv-from-os)
 endif
 	touch .$(CONTRIBREV)
 
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index abaa82a..7e832dc 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -358,21 +358,21 @@ libiconv-snowleopard: libiconv-snowleopard.tar.bz2
 
 ifdef HAVE_MACOSX
 ifdef HAVE_MACOSX_DARWIN_10
-.iconv: libiconv-snowleopard
+.iconv-from-os: libiconv-snowleopard
 	(cd libiconv-snowleopard && cp libiconv.* $(PREFIX)/lib/)
 	touch $@
 else
-.iconv:
+.iconv-from-os:
 	touch $@
 endif
-else
+endif
+
 .iconv: libiconv
 	(cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
 	$(INSTALL_NAME)
 	touch $@
-endif
 
-CLEAN_FILE += .iconv
+CLEAN_FILE += .iconv .iconv-from-os
 CLEAN_PKG += libiconv
 DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz