[vlc-commits] contribs: revert unintended change in previous commit

Felix Paul Kühne git at videolan.org
Tue Aug 9 17:33:38 CEST 2011


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Aug  9 17:33:31 2011 +0200| [2cdfae96aef461ee238c5ba3b1b3d18ed1ed1960] | committer: Felix Paul Kühne

contribs: revert unintended change in previous commit

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

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

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index 2e1312f..d8d657a 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -40,7 +40,7 @@ using-src:
 	$(MAKE) -C build-src tools
 	$(MAKE) -C build-src
 
-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)
 endif
 
@@ -70,8 +70,10 @@ 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_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-from-os)
+endif
 	touch .$(CONTRIBREV)
 
 using-bin: .$(CONTRIBREV) 



More information about the vlc-commits mailing list