contrib: Make sure we properly do the ugly hack for iconv on OS X.

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 5ba519cbff50232b82492d15a054666c088e8675..40748d14cd3b2c55048734e0ceb903a89ff9c7b8 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -68,7 +68,7 @@ hosts/$(HOST)/.$(CONTRIBREV): contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
     # result in linking issues
 ifdef HAVE_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 src && $(MAKE) .iconv)
+       (cd src && rm .iconv && $(MAKE) .iconv)
 endif
        touch hosts/$(HOST)/.$(CONTRIBREV)
 

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f5d086b9ea74bf8acbaceaa20591d1944c9e0feb..a4bd26f609815dd2be0b1179e185782f16a122dd 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -438,6 +438,7 @@ libiconv-snowleopard: libiconv-snowleopard.tar.bz2
 ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_10
 .iconv: libiconv-snowleopard
+       (cd libiconv-snowleopard && sed -i.orig s:/usr/lib:$(PREFIX)/lib/: libiconv.la)
        (cd libiconv-snowleopard && cp libiconv.* $(PREFIX)/lib/)
        touch $@
 else