diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-05 14:23:42 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-05 14:23:42 +0000 |
commit | 5dfe4e471fbd2bd1c55f4fb69ade42994f3fdd3c (patch) | |
tree | 4b6313dc79e91a12cb31f06321d47bcfff0e33d9 /rules/xorg-font-micro-misc.make | |
parent | e5201bdfed55667611e3164099849cff20683c8d (diff) | |
download | ptxdist-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-micro-misc.make')
-rw-r--r-- | rules/xorg-font-micro-misc.make | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make index 599aa47b8..6e5dfd718 100644 --- a/rules/xorg-font-micro-misc.make +++ b/rules/xorg-font-micro-misc.make @@ -24,6 +24,9 @@ XORG_FONT_MICRO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG XORG_FONT_MICRO_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX) XORG_FONT_MICRO_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MICRO_MISC) +ifdef PTXCONF_XORG_FONT_MICRO_MISC +$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-micro-misc.targetinstall +endif # ---------------------------------------------------------------------------- # Get @@ -64,7 +67,9 @@ XORG_FONT_MICRO_MISC_ENV := $(CROSS_ENV) # # autoconf # -XORG_FONT_MICRO_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR) +XORG_FONT_MICRO_MISC_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --with-fontdir=$(XORG_FONTDIR)/misc $(STATEDIR)/xorg-font-micro-misc.prepare: $(xorg-font-micro-misc_prepare_deps_default) @$(call targetinfo, $@) @@ -104,22 +109,13 @@ xorg-font-micro-misc_targetinstall: $(STATEDIR)/xorg-font-micro-misc.targetinsta $(STATEDIR)/xorg-font-micro-misc.targetinstall: $(xorg-font-micro-misc_targetinstall_deps_default) @$(call targetinfo, $@) - @$(call install_init, xorg-font-micro-misc) - @$(call install_fixup, xorg-font-micro-misc,PACKAGE,xorg-font-micro-misc) - @$(call install_fixup, xorg-font-micro-misc,PRIORITY,optional) - @$(call install_fixup, xorg-font-micro-misc,VERSION,$(XORG_FONT_MICRO_MISC_VERSION)) - @$(call install_fixup, xorg-font-micro-misc,SECTION,base) - @$(call install_fixup, xorg-font-micro-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>") - @$(call install_fixup, xorg-font-micro-misc,DEPENDS,) - @$(call install_fixup, xorg-font-micro-misc,DESCRIPTION,missing) - - @cd $(XORG_FONT_MICRO_MISC_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-micro-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \ + @find $(XORG_FONT_MICRO_MISC_DIR) \ + -name "*.pcf.gz" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/misc; \ done - @$(call install_finish, xorg-font-micro-misc) - @$(call touch, $@) # ---------------------------------------------------------------------------- |