diff options
Diffstat (limited to 'rules/xorg-font-bh-lucidatypewriter-100dpi.make')
| -rw-r--r-- | rules/xorg-font-bh-lucidatypewriter-100dpi.make | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make index 3b47733a4..83174e2e6 100644 --- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make @@ -82,7 +82,7 @@ xorg-font-bh-lucidatypewriter-100dpi_compile: $(STATEDIR)/xorg-font-bh-lucidatyp $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.compile: $(xorg-font-bh-lucidatypewriter-100dpi_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR) && $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_PATH) make + cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR) && $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_PATH) make UTIL_DIR=$(SYSROOT)/usr/lib/X11/fonts/util/ @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.targetinstall: $(xorg-font-bh-l @$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,DESCRIPTION,missing) @cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ - done + for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_TRANS + @cd $(XORG_FONT_BH_LUCIDATYPEWRITER_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-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-bh-lucidatypewriter-100dpi) |