From 803967499fb362d2fe394647d4a4a59932f6a708 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 May 2010 20:10:02 +0200 Subject: xfonts: fix dependencies and build process Instead of assuming that mkfontdir and mkfontscale are available on the development system, use the one installed in $(HOST_DIR). The FCCACHE variable is removed, because, for some reason, the installation process of xfonts disables the call to fc-cache when a DESTDIR is passed. See the definition of XORG_FONT_FCCACHE in aclocal.m4 in font packages: AC_DEFUN([XORG_FONT_FCCACHE],[ AC_PATH_PROG(FCCACHE, fc-cache) FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"' if test x"$FCCACHE" = x ; then RUN_FCCACHE="${FCCACHE_WARN}" else RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else' RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)" fi AC_SUBST([RUN_FCCACHE]) ]) In addition to this, we update the font dependencies to include font-utils for the host, mkfontdir for the host, mkfontscale for the host and bdftopcf for the host. Signed-off-by: Thomas Petazzoni --- package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/x11r7/xfont_font-sun-misc') diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk index f06ecf7ed..9364e4a38 100644 --- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk @@ -8,9 +8,9 @@ XFONT_FONT_SUN_MISC_VERSION = 1.0.1 XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.bz2 XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_SUN_MISC_AUTORECONF = NO -XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install -XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data -XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util +XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install +XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data +XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-sun-misc)) -- cgit v1.2.3