]> git.sesse.net Git - vlc/commitdiff
contribs: revert unintended change in previous commit
authorFelix Paul Kühne <fkuehne@videolan.org>
Tue, 9 Aug 2011 15:33:31 +0000 (17:33 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Tue, 9 Aug 2011 15:33:31 +0000 (17:33 +0200)
extras/contrib/contrib.mak

index 2e1312f2138861073ed13902a379ec39026ae63d..d8d657a906ae1c7596aac23a8ca6fd68390d2ff8 100644 (file)
@@ -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)