From 4a57f7d261fdb93e4c8dac30907d7f06bf176f11 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 May 2010 20:02:51 +0200 Subject: xfont_font-util: enable host package When compiling xfonts, host utilities like bdftopcf or ucs2any, part of xfont_font-util are needed. Until now, xfont_font-util was installing ugly symbolic links, assuming that these tools were available on the development machine. This patch enables the host package for xfont_font-util, removes the post-install.sh script, and keeps only the useful part of this script in a post install hook. host-xfont_font-util will be used later by xfont packages. Signed-off-by: Thomas Petazzoni --- package/x11r7/xfont_font-util/xfont_font-util.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package/x11r7/xfont_font-util/xfont_font-util.mk') diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index 3f59b17ab..3ca51ac91 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -11,10 +11,15 @@ XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config XFONT_FONT_UTIL_INSTALL_STAGING = YES XFONT_FONT_UTIL_INSTALL_TARGET = NO +HOST_XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config + define XFONT_FONT_UTIL_POST_INSTALL_FIXES - package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) + sed "s,^mapdir=.*,mapdir=$(STAGING_DIR)/usr/share/fonts/X11/util,g" \ + $(STAGING_DIR)/usr/lib/pkgconfig/fontutil.pc > $(STAGING_DIR)/usr/lib/pkgconfig/fontutil.pc.new + mv $(STAGING_DIR)/usr/lib/pkgconfig/fontutil.pc.new $(STAGING_DIR)/usr/lib/pkgconfig/fontutil.pc endef XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util)) +$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util,host)) -- cgit v1.2.3