diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 12:49:25 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 12:49:25 +0000 |
| commit | 8770722774b0065cb425bcc0a701e6d794b59e93 (patch) | |
| tree | 0090aa4f25322c48e897ac8d52c313299847864a /rules/xorg-app-mkfontdir.make | |
| parent | 9f7e792b1da3d72dbbdaedfa10ad69824488d8d1 (diff) | |
| download | ptxdist-8770722774b0065cb425bcc0a701e6d794b59e93.tar.gz ptxdist-8770722774b0065cb425bcc0a701e6d794b59e93.tar.xz | |
* mkfontdir: moved to xorg namespace for hosttools.
Merged from branches/ptxdist-trunk-mkl by rsc.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6651 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/xorg-app-mkfontdir.make')
| -rw-r--r-- | rules/xorg-app-mkfontdir.make | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make index 5f001380d..2204b6ffc 100644 --- a/rules/xorg-app-mkfontdir.make +++ b/rules/xorg-app-mkfontdir.make @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Id: template 4761 2006-02-24 17:35:57Z sha $ +# $Id: template 6487 2006-12-07 20:55:55Z rsc $ # # Copyright (C) 2006 by Sascha Hauer # @@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTDIR) += xorg-app-mkfontdir # # Paths and names # -XORG_APP_MKFONTDIR_VERSION := 1.0.1 -XORG_APP_MKFONTDIR := mkfontscale-X11R7.0-$(XORG_APP_MKFONTDIR_VERSION) +XORG_APP_MKFONTDIR_VERSION := 1.0.2 +XORG_APP_MKFONTDIR := mkfontdir-X11R7.1-$(XORG_APP_MKFONTDIR_VERSION) XORG_APP_MKFONTDIR_SUFFIX := tar.bz2 -XORG_APP_MKFONTDIR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX) +XORG_APP_MKFONTDIR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX) XORG_APP_MKFONTDIR_SOURCE := $(SRCDIR)/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX) XORG_APP_MKFONTDIR_DIR := $(BUILDDIR)/$(XORG_APP_MKFONTDIR) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -58,8 +57,8 @@ $(STATEDIR)/xorg-app-mkfontdir.extract: $(xorg-app-mkfontdir_extract_deps_defaul xorg-app-mkfontdir_prepare: $(STATEDIR)/xorg-app-mkfontdir.prepare -XORG_APP_MKFONTDIR_PATH := PATH=$(CROSS_PATH) -XORG_APP_MKFONTDIR_ENV := $(CROSS_ENV) +XORG_APP_MKFONTDIR_PATH := PATH=$(CROSS_PATH) +XORG_APP_MKFONTDIR_ENV := $(CROSS_ENV) # # autoconf @@ -84,12 +83,7 @@ xorg-app-mkfontdir_compile: $(STATEDIR)/xorg-app-mkfontdir.compile $(STATEDIR)/xorg-app-mkfontdir.compile: $(xorg-app-mkfontdir_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_APP_MKFONTDIR_DIR) && $(XORG_APP_MKFONTDIR_PATH) make - -# mkfontdir is just a wrapper for mkfontscale -b -s -l. generate it - echo "#!/bin/sh" > $(XORG_APP_MKFONTDIR_DIR)/mkfontdir - echo "exec $(XORG_BINDIR)/mkfontscale -b -s -l \"\$$@\"" >> $(XORG_APP_MKFONTDIR_DIR)/mkfontdir - + cd $(XORG_APP_MKFONTDIR_DIR) && $(XORG_APP_MKFONTDIR_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -113,18 +107,17 @@ $(STATEDIR)/xorg-app-mkfontdir.targetinstall: $(xorg-app-mkfontdir_targetinstall @$(call targetinfo, $@) @$(call install_init, xorg-app-mkfontdir) - @$(call install_fixup,xorg-app-mkfontdir,PACKAGE,xorg-app-mkfontdir) - @$(call install_fixup,xorg-app-mkfontdir,PRIORITY,optional) - @$(call install_fixup,xorg-app-mkfontdir,VERSION,$(XORG_APP_MKFONTDIR_VERSION)) - @$(call install_fixup,xorg-app-mkfontdir,SECTION,base) - @$(call install_fixup,xorg-app-mkfontdir,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - @$(call install_fixup,xorg-app-mkfontdir,DEPENDS,) - @$(call install_fixup,xorg-app-mkfontdir,DESCRIPTION,missing) - - @$(call install_copy, xorg-app-mkfontdir, 0, 0, 0755, $(XORG_APP_MKFONTDIR_DIR)/mkfontscale, $(XORG_BINDIR)/mkfontscale) - @$(call install_copy, xorg-app-mkfontdir, 0, 0, 0755, $(XORG_APP_MKFONTDIR_DIR)/mkfontdir, $(XORG_BINDIR)/mkfontdir) - - @$(call install_finish,xorg-app-mkfontdir) + @$(call install_fixup, xorg-app-mkfontdir,PACKAGE,xorg-app-mkfontdir) + @$(call install_fixup, xorg-app-mkfontdir,PRIORITY,optional) + @$(call install_fixup, xorg-app-mkfontdir,VERSION,$(XORG_APP_MKFONTDIR_VERSION)) + @$(call install_fixup, xorg-app-mkfontdir,SECTION,base) + @$(call install_fixup, xorg-app-mkfontdir,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, xorg-app-mkfontdir,DEPENDS,) + @$(call install_fixup, xorg-app-mkfontdir,DESCRIPTION,missing) + + @$(call install_copy, xorg-app-mkfontdir, 0, 0, 0755, $(XORG_APP_MKFONTDIR_DIR)/foobar, /dev/null) + + @$(call install_finish, xorg-app-mkfontdir) @$(call touch, $@) |