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

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)
 

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