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-bitstream-type1.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-bitstream-type1.make')
| -rw-r--r-- | rules/xorg-font-bitstream-type1.make | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make index 1f6d14137..3f5b7d0fa 100644 --- a/rules/xorg-font-bitstream-type1.make +++ b/rules/xorg-font-bitstream-type1.make @@ -20,10 +20,13 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_TYPE1) += xorg-font-bitstream-type1 XORG_FONT_BITSTREAM_TYPE1_VERSION := 1.0.0 XORG_FONT_BITSTREAM_TYPE1 := font-bitstream-type1-X11R7.0-$(XORG_FONT_BITSTREAM_TYPE1_VERSION) XORG_FONT_BITSTREAM_TYPE1_SUFFIX := tar.bz2 -XORG_FONT_BITSTREAM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX) +XORG_FONT_BITSTREAM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX) XORG_FONT_BITSTREAM_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX) XORG_FONT_BITSTREAM_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_TYPE1) +ifdef PTXCONF_XORG_FONT_BITSTREAM_TYPE1 +$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bitstream-type1.targetinstall +endif # ---------------------------------------------------------------------------- # Get @@ -64,7 +67,9 @@ XORG_FONT_BITSTREAM_TYPE1_ENV := $(CROSS_ENV) # # autoconf # -XORG_FONT_BITSTREAM_TYPE1_AUTOCONF := $(CROSS_AUTOCONF_USR) +XORG_FONT_BITSTREAM_TYPE1_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --with-fontdir=$(XORG_FONTDIR)/Type1 $(STATEDIR)/xorg-font-bitstream-type1.prepare: $(xorg-font-bitstream-type1_prepare_deps_default) @$(call targetinfo, $@) @@ -82,7 +87,7 @@ xorg-font-bitstream-type1_compile: $(STATEDIR)/xorg-font-bitstream-type1.compile $(STATEDIR)/xorg-font-bitstream-type1.compile: $(xorg-font-bitstream-type1_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_FONT_BITSTREAM_TYPE1_DIR) && $(XORG_FONT_BITSTREAM_TYPE1_PATH) make + cd $(XORG_FONT_BITSTREAM_TYPE1_DIR) && $(XORG_FONT_BITSTREAM_TYPE1_PATH) $(MAKE) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -104,21 +109,15 @@ xorg-font-bitstream-type1_targetinstall: $(STATEDIR)/xorg-font-bitstream-type1.t $(STATEDIR)/xorg-font-bitstream-type1.targetinstall: $(xorg-font-bitstream-type1_targetinstall_deps_default) @$(call targetinfo, $@) - @$(call install_init, xorg-font-bitstream-type1) - @$(call install_fixup, xorg-font-bitstream-type1,PACKAGE,xorg-font-bitstream-type1) - @$(call install_fixup, xorg-font-bitstream-type1,PRIORITY,optional) - @$(call install_fixup, xorg-font-bitstream-type1,VERSION,$(XORG_FONT_BITSTREAM_TYPE1_VERSION)) - @$(call install_fixup, xorg-font-bitstream-type1,SECTION,base) - @$(call install_fixup, xorg-font-bitstream-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>") - @$(call install_fixup, xorg-font-bitstream-type1,DEPENDS,) - @$(call install_fixup, xorg-font-bitstream-type1,DESCRIPTION,missing) - - @cd $(XORG_FONT_BITSTREAM_TYPE1_DIR); \ - for file in *.afm *.pfb; do \ - $(call install_copy, xorg-font-bitstream-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \ - done + @mkdir -p $(XORG_FONTS_DIR_INSTALL)/Type1 - @$(call install_finish, xorg-font-bitstream-type1) + @find $(XORG_FONT_BITSTREAM_TYPE1_DIR) \ + -name "*.afm" \ + -o -name "*.pfb" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/Type1; \ + done @$(call touch, $@) |