summaryrefslogtreecommitdiffstats
path: root/rules/xorg-font-misc-meltho.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-misc-meltho.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-misc-meltho.make')
-rw-r--r--rules/xorg-font-misc-meltho.make32
1 files changed, 15 insertions, 17 deletions
diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make
index 7aca56e9c..e0fec3d59 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MELTHO) += xorg-font-misc-meltho
XORG_FONT_MISC_MELTHO_VERSION := 1.0.0
XORG_FONT_MISC_MELTHO := font-misc-meltho-X11R7.0-$(XORG_FONT_MISC_MELTHO_VERSION)
XORG_FONT_MISC_MELTHO_SUFFIX := tar.bz2
-XORG_FONT_MISC_MELTHO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
+XORG_FONT_MISC_MELTHO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
XORG_FONT_MISC_MELTHO_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
XORG_FONT_MISC_MELTHO_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_MELTHO)
+ifdef PTXCONF_XORG_FONT_MISC_MELTHO
+$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-misc-meltho.targetinstall
+endif
# ----------------------------------------------------------------------------
# Get
@@ -64,7 +67,9 @@ XORG_FONT_MISC_MELTHO_ENV := $(CROSS_ENV)
#
# autoconf
#
-XORG_FONT_MISC_MELTHO_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_FONT_MISC_MELTHO_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR) \
+ --with-fontdir=$(XORG_FONTDIR)/opentype
$(STATEDIR)/xorg-font-misc-meltho.prepare: $(xorg-font-misc-meltho_prepare_deps_default)
@$(call targetinfo, $@)
@@ -82,7 +87,7 @@ xorg-font-misc-meltho_compile: $(STATEDIR)/xorg-font-misc-meltho.compile
$(STATEDIR)/xorg-font-misc-meltho.compile: $(xorg-font-misc-meltho_compile_deps_default)
@$(call targetinfo, $@)
- cd $(XORG_FONT_MISC_MELTHO_DIR) && $(XORG_FONT_MISC_MELTHO_PATH) make
+ cd $(XORG_FONT_MISC_MELTHO_DIR) && $(XORG_FONT_MISC_MELTHO_PATH) $(MAKE)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -104,21 +109,14 @@ xorg-font-misc-meltho_targetinstall: $(STATEDIR)/xorg-font-misc-meltho.targetins
$(STATEDIR)/xorg-font-misc-meltho.targetinstall: $(xorg-font-misc-meltho_targetinstall_deps_default)
@$(call targetinfo, $@)
- @$(call install_init, xorg-font-misc-meltho)
- @$(call install_fixup, xorg-font-misc-meltho,PACKAGE,xorg-font-misc-meltho)
- @$(call install_fixup, xorg-font-misc-meltho,PRIORITY,optional)
- @$(call install_fixup, xorg-font-misc-meltho,VERSION,$(XORG_FONT_MISC_MELTHO_VERSION))
- @$(call install_fixup, xorg-font-misc-meltho,SECTION,base)
- @$(call install_fixup, xorg-font-misc-meltho,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
- @$(call install_fixup, xorg-font-misc-meltho,DEPENDS,)
- @$(call install_fixup, xorg-font-misc-meltho,DESCRIPTION,missing)
-
- @cd $(XORG_FONT_MISC_MELTHO_DIR); \
- for file in *.otf; do \
- $(call install_copy, xorg-font-misc-meltho, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
- done
+ @mkdir -p $(XORG_FONTS_DIR_INSTALL)/opentype
- @$(call install_finish, xorg-font-misc-meltho)
+ @find $(XORG_FONT_MISC_MELTHO_DIR) \
+ -name "*.otf" \
+ | \
+ while read file; do \
+ install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/opentype; \
+ done
@$(call touch, $@)