Skip to content

V
vlc-2-2
Commit 2cdfae96 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: revert unintended change in previous commit

parent 0cdef305
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
extras/contrib/contrib.mak
View file @ 2cdfae96
...@@ -40,7 +40,7 @@ using-src: ...@@ -40,7 +40,7 @@ using-src:
$(MAKE) -C build-src tools $(MAKE) -C build-src tools
$(MAKE) -C build-src $(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) (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
endif endif
...@@ -70,8 +70,10 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2: ...@@ -70,8 +70,10 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
(cd build-src && rm -rf *gecko* && $(MAKE) .gecko) (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 # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
# result in linking issues # 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 $(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) (cd build-src && rm -f .iconv && $(MAKE) .iconv-from-os)
endif
touch .$(CONTRIBREV) touch .$(CONTRIBREV)
using-bin: .$(CONTRIBREV) using-bin: .$(CONTRIBREV)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment