From f0a3b00e9a54dfe39f4347f23cb9b20d9446907a Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Tue, 16 Feb 2010 01:48:39 +0100 Subject: [PATCH] contrib: Make sure we properly do the ugly hack for iconv on OS X. --- extras/contrib/Makefile | 2 +- extras/contrib/src/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile index 5ba519cbff..40748d14cd 100644 --- 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 f5d086b9ea..a4bd26f609 100644 --- 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 -- 2.39.2