From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sat, 30 Jan 2010 22:32:44 +0000 (+0100)
Subject: contribs: fixed fontconfig cross-compilation on Darwin
X-Git-Tag: 1.1.0-ff~638
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fe2d4b8d222cae5b2798aaae9371fc3972a465f8;p=vlc

contribs: fixed fontconfig cross-compilation on Darwin
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b6ba0f0bf4..bfe6c0a8ad 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -469,13 +469,13 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
 ifdef HAVE_WIN32
 	patch -p0 < Patches/fontconfig.patch
 	patch -p0 < Patches/fontconfig-noxml2.patch
-endif
 	(cd $@; autoreconf -ivf)
+endif
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-	(cd $<;  ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+	(cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
 	(cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 --disable-docs && make && make install)
   endif