xfont_font-util: install in staging as it used to be

Before the autotools conversion, xfont_font-util was installed in
staging, so keep this.

However, the current way of handling xfont_font-util is ugly. The
post-install.sh script removes the binaries compiled for the target
from the staging directory and replaces them by symbolic links to
utils installed on the host (making the incorrect assumption that they
are available).

It looks like xfont_font-util needs to be built for the host (using
the new infrastructure for host autotools package). This is certainly
post-2010.02 though.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2010-02-25 08:39:04 +01:00 committed by Peter Korsgaard
parent ba50538cfa
commit 39d38a08a1
2 changed files with 4 additions and 2 deletions

View File

@ -3,7 +3,7 @@
Fixes all over the tree. Fixes all over the tree.
Updated/fixed packages: busybox, ipsec-tools, libgtk2, madplay, Updated/fixed packages: busybox, ipsec-tools, libgtk2, madplay,
netsnmp, pango, sylpheed, qt netsnmp, pango, sylpheed, qt, xfont_font-util
Removed packages: openmotif, xpdf Removed packages: openmotif, xpdf

View File

@ -8,6 +8,8 @@ XFONT_FONT_UTIL_VERSION = 1.0.1
XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
XFONT_FONT_UTIL_INSTALL_STAGING = YES
XFONT_FONT_UTIL_INSTALL_TARGET = NO
define XFONT_FONT_UTIL_POST_INSTALL_FIXES define XFONT_FONT_UTIL_POST_INSTALL_FIXES
$(@D)/post-install.sh $(STAGING_DIR) $(@D)/post-install.sh $(STAGING_DIR)
@ -15,4 +17,4 @@ endef
XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES 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))