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-adobe-100dpi.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-adobe-100dpi.make')
| -rw-r--r-- | rules/xorg-font-adobe-100dpi.make | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make index f2f8d4086..ce99aa6b9 100644 --- a/rules/xorg-font-adobe-100dpi.make +++ b/rules/xorg-font-adobe-100dpi.make @@ -24,6 +24,9 @@ XORG_FONT_ADOBE_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XOR XORG_FONT_ADOBE_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX) XORG_FONT_ADOBE_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_100DPI) +ifdef PTXCONF_XORG_FONT_ADOBE_100DPI +$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall +endif # ---------------------------------------------------------------------------- # Get @@ -64,7 +67,9 @@ XORG_FONT_ADOBE_100DPI_ENV := $(CROSS_ENV) # # autoconf # -XORG_FONT_ADOBE_100DPI_AUTOCONF := $(CROSS_AUTOCONF_USR) +XORG_FONT_ADOBE_100DPI_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --with-fontdir=$(XORG_FONTDIR)/100dpi $(STATEDIR)/xorg-font-adobe-100dpi.prepare: $(xorg-font-adobe-100dpi_prepare_deps_default) @$(call targetinfo, $@) @@ -82,7 +87,7 @@ xorg-font-adobe-100dpi_compile: $(STATEDIR)/xorg-font-adobe-100dpi.compile $(STATEDIR)/xorg-font-adobe-100dpi.compile: $(xorg-font-adobe-100dpi_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_FONT_ADOBE_100DPI_DIR) && $(XORG_FONT_ADOBE_100DPI_PATH) make + cd $(XORG_FONT_ADOBE_100DPI_DIR) && $(XORG_FONT_ADOBE_100DPI_PATH) $(MAKE) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -93,7 +98,6 @@ xorg-font-adobe-100dpi_install: $(STATEDIR)/xorg-font-adobe-100dpi.install $(STATEDIR)/xorg-font-adobe-100dpi.install: $(xorg-font-adobe-100dpi_install_deps_default) @$(call targetinfo, $@) - @$(call install, XORG_FONT_ADOBE_100DPI) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -105,38 +109,31 @@ xorg-font-adobe-100dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-100dpi.targeti $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall: $(xorg-font-adobe-100dpi_targetinstall_deps_default) @$(call targetinfo, $@) - @$(call install_init, xorg-font-adobe-100dpi) - @$(call install_fixup, xorg-font-adobe-100dpi,PACKAGE,xorg-font-adobe-100dpi) - @$(call install_fixup, xorg-font-adobe-100dpi,PRIORITY,optional) - @$(call install_fixup, xorg-font-adobe-100dpi,VERSION,$(XORG_FONT_ADOBE_100DPI_VERSION)) - @$(call install_fixup, xorg-font-adobe-100dpi,SECTION,base) - @$(call install_fixup, xorg-font-adobe-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>") - @$(call install_fixup, xorg-font-adobe-100dpi,DEPENDS,) - @$(call install_fixup, xorg-font-adobe-100dpi,DESCRIPTION,missing) - - @cd $(XORG_FONT_ADOBE_100DPI_DIR); \ - for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ - if [ -e $$file ]; then \ - $(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ - fi; \ - done; - - @cd $(XORG_FONT_ADOBE_100DPI_DIR); \ - for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ - if [ -e $$file ]; then \ - $(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ - fi; \ - done; + @mkdir -p $(XORG_FONTS_DIR_INSTALL)/100dpi + + @find $(XORG_FONT_ADOBE_100DPI_DIR) \ + -name "*.pcf.gz" -a \! -name "*ISO8859*" \ + -o -name "*ISO8859-1.pcf.gz" \ + -o -name "*ISO8859-15.pcf.gz" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \ + done ifdef PTXCONF_XORG_FONT_ADOBE_100DPI_TRANS - @cd $(XORG_FONT_ADOBE_100DPI_DIR); \ - for file in *{ISO8859-2,ISO8859-3,ISO8859-4,ISO8859-9,ISO8859-10,ISO8859-13,ISO8859-14}.pcf.gz; do \ - if [ -e $$file ]; then \ - $(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ - fi; \ - done; + @find $(XORG_FONT_ADOBE_100DPI_DIR) \ + -name "*ISO8859-2.pcf.gz" \ + -o -name "*ISO8859-3.pcf.gz" \ + -o -name "*ISO8859-4.pcf.gz" \ + -o -name "*ISO8859-9.pcf.gz" \ + -o -name "*ISO8859-10.pcf.gz" \ + -o -name "*ISO8859-13.pcf.gz" \ + -o -name "*ISO8859-14.pcf.gz" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/100dpi; \ + done endif - @$(call install_finish, xorg-font-adobe-100dpi) @$(call touch, $@) |