summaryrefslogtreecommitdiffstats
path: root/rules/xorg-font-alias.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2007-01-05 14:23:42 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2007-01-05 14:23:42 +0000
commit5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c (patch)
tree4b6313dc79e91a12cb31f06321d47bcfff0e33d9 /rules/xorg-font-alias.make
parente5201bdfed55667611e3164099849cff20683c8d (diff)
downloadptxdist-5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c.tar.gz
ptxdist-5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c.tar.xz
* xorg-font*:
new font stuff git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6736 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/xorg-font-alias.make')
-rw-r--r--rules/xorg-font-alias.make16
1 files changed, 9 insertions, 7 deletions
diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
index c9d9b874f..d7bd8c6cb 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias
XORG_FONT_ALIAS_VERSION := 1.0.1
XORG_FONT_ALIAS := font-alias-X11R7.0-$(XORG_FONT_ALIAS_VERSION)
XORG_FONT_ALIAS_SUFFIX := tar.bz2
-XORG_FONT_ALIAS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
+XORG_FONT_ALIAS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
XORG_FONT_ALIAS_SOURCE := $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
XORG_FONT_ALIAS_DIR := $(BUILDDIR)/$(XORG_FONT_ALIAS)
@@ -64,7 +64,9 @@ XORG_FONT_ALIAS_ENV := $(CROSS_ENV)
#
# autoconf
#
-XORG_FONT_ALIAS_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_ALIAS_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR) \
+ --with-top-fontdir=$(XORG_FONTDIR)
$(STATEDIR)/xorg-font-alias.prepare: $(xorg-font-alias_prepare_deps_default)
@$(call targetinfo, $@)
@@ -82,7 +84,7 @@ xorg-font-alias_compile: $(STATEDIR)/xorg-font-alias.compile
$(STATEDIR)/xorg-font-alias.compile: $(xorg-font-alias_compile_deps_default)
@$(call targetinfo, $@)
- cd $(XORG_FONT_ALIAS_DIR) && $(XORG_FONT_ALIAS_PATH) make
+ cd $(XORG_FONT_ALIAS_DIR) && $(XORG_FONT_ALIAS_PATH) $(MAKE)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -114,10 +116,10 @@ $(STATEDIR)/xorg-font-alias.targetinstall: $(xorg-font-alias_targetinstall_deps_
@$(call install_fixup, xorg-font-alias,DEPENDS,)
@$(call install_fixup, xorg-font-alias,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/100dpi/fonts.alias, $(XORG_FONTDIR)/100dpi/fonts.alias)
- @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/75dpi/fonts.alias, $(XORG_FONTDIR)/75dpi/fonts.alias)
- @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/cyrillic/fonts.alias, $(XORG_FONTDIR)/cyrillic/fonts.alias)
- @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/misc/fonts.alias, $(XORG_FONTDIR)/misc/fonts.alias)
+ @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/100dpi/fonts.alias, $(XORG_FONTDIR)/100dpi/fonts.alias, n)
+ @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/75dpi/fonts.alias, $(XORG_FONTDIR)/75dpi/fonts.alias, n)
+ @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/cyrillic/fonts.alias, $(XORG_FONTDIR)/cyrillic/fonts.alias, n)
+ @$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/misc/fonts.alias, $(XORG_FONTDIR)/misc/fonts.alias, n)
@$(call install_finish, xorg-font-alias)