contrib: fix and clean up fontconfig

contrib/src/fontconfig/rules.mak

@@ -4,6 +4,9 @@ FONTCONFIG_VERSION := 2.8.0
 FONTCONFIG_URL := http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
 
 PKGS += fontconfig
+ifeq ($(call need_pkg,"fontconfig"),)
+PKGS_FOUND += fontconfig
+endif
 
 $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
 	$(call download,$(FONTCONFIG_URL))
@@ -19,23 +22,30 @@ ifdef HAVE_WIN32
 endif
 	$(MOVE)
 
-FONTCONFIG_BASE_CONF = --prefix=$(PREFIX) \
-					   --with-freetype-config=$(PREFIX)/bin/freetype-config \
+FONTCONFIG_CONF := $(HOSTCONF) \
 	--enable-libxml2 \
 	--disable-docs
+FONTCONFIG_ENV := $(HOSTVARS)
+
+# FreeType flags
+ifneq ($(findstring freetype2,$(PKGS)),)
+FONTCONFIG_CONF += --with-freetype-config="$(PREFIX)/bin/freetype-config"
+endif
 
-FONTCONFIG_CONF-$(ENABLED)      = $(HOSTCONF) $(FONTCONFIG_BASE_CONF)
-FONTCONFIG_CONF-$(HAVE_WIN32)   = $(HOSTCONF) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-docs --with-arch=i686
-FONTCONFIG_CONF-$(HAVE_MACOSX) += $(HOSTCONF) \
+ifdef HAVE_CROSS_COMPILE
+FONTCONFIG_CONF += --with-arch=$(ARCH)
+endif
+
+ifdef HAVE_MACOSX
+FONTCONFIG_CONF += \
 	--with-cache-dir=~/Library/Caches/fontconfig \
 	--with-confdir=/usr/X11/lib/X11/fonts \
 	--with-default-fonts=/System/Library/Fonts \
-	--with-add-fonts=/Library/Fonts,~/Library/Fonts  \
-	--with-arch=$(ARCH)
-
-FONTCONFIG_ENV-$(ENABLED)         = $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags`
-FONTCONFIG_ENV-$(HAVE_MACOSX)     = $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs`
-FONTCONFIG_ENV-$(HAVE_WIN32)      = $(HOSTCC)
+	--with-add-fonts=/Library/Fonts,~/Library/Fonts
+# libxml2 without pkg-config...
+FONTCONFIG_ENV += LIBXML2_CFLAGS=`xml2-config --cflags`
+FONTCONFIG_ENV += LIBXML2_LIBS=`xml2-config --libs`
+endif
 
 DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
 
@@ -43,11 +53,14 @@ DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
 ifdef HAVE_WIN32
 	$(RECONF)
 endif
-	cd $<; $(FONTCONFIG_ENV-1) ./configure $(FONTCONFIG_CONF-1) && make
+	cd $< && $(FONTCONFIG_ENV) ./configure $(FONTCONFIG_CONF)
+	cd $< && $(MAKE)
 ifndef HAVE_MACOSX
-	cd $<; make install
+	cd $< && $(MAKE) install
 else
-	cd $<; make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc     $(PKG_CONFIG_LIBDIR) && sed -e 's%/usr/lib/libiconv.la%%' -i.orig $(PREFIX)/lib/libfontconfig.la
+	cd $< && $(MAKE) install-exec
+	cd $</fontconfig && $(MAKE) install-data
+	sed -e 's%/usr/lib/libiconv.la%%' -i.orig $(PREFIX)/lib/libfontconfig.la
+	cp $</fontconfig.pc $(PREFIX)/lib/pkgconfig
 endif
-	$(INSTALL_NAME)
 	touch $@