diff options
author | Luotao Fu <l.fu@pengutronix.de> | 2006-12-15 16:24:58 +0000 |
---|---|---|
committer | Luotao Fu <l.fu@pengutronix.de> | 2006-12-15 16:24:58 +0000 |
commit | 393132e030a18f9867bc762f9faa6aaa01dd84c5 (patch) | |
tree | b39365355b899657f2b2d7660b4be73082b2c0e4 /rules | |
parent | acaa252eabacb543d1769543fbab02007cf4c49e (diff) | |
download | ptxdist-393132e030a18f9867bc762f9faa6aaa01dd84c5.tar.gz ptxdist-393132e030a18f9867bc762f9faa6aaa01dd84c5.tar.xz |
redefined target install stage to minimize installation size
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6502 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r-- | rules/xorg-font-adobe-100dpi.make | 23 | ||||
-rw-r--r-- | rules/xorg-font-adobe-75dpi.make | 24 | ||||
-rw-r--r-- | rules/xorg-font-adobe-utopia-100dpi.make | 24 | ||||
-rw-r--r-- | rules/xorg-font-adobe-utopia-75dpi.make | 24 | ||||
-rw-r--r-- | rules/xorg-font-bh-100dpi.make | 26 | ||||
-rw-r--r-- | rules/xorg-font-bh-75dpi.make | 26 | ||||
-rw-r--r-- | rules/xorg-font-bh-lucidatypewriter-100dpi.make | 26 | ||||
-rw-r--r-- | rules/xorg-font-bh-lucidatypewriter-75dpi.make | 26 | ||||
-rw-r--r-- | rules/xorg-font-bh-ttf.make | 7 | ||||
-rw-r--r-- | rules/xorg-font-bitstream-100dpi.make | 24 | ||||
-rw-r--r-- | rules/xorg-font-bitstream-75dpi.make | 24 | ||||
-rw-r--r-- | rules/xorg-font-misc-misc.make | 24 |
12 files changed, 240 insertions, 38 deletions
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make index 7ee67460c..43beff732 100644 --- a/rules/xorg-font-adobe-100dpi.make +++ b/rules/xorg-font-adobe-100dpi.make @@ -114,10 +114,27 @@ $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall: $(xorg-font-adobe-100dpi_targe @$(call install_fixup, xorg-font-adobe-100dpi,DESCRIPTION,missing) @cd $(XORG_FONT_ADOBE_100DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-adobe-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-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; + +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; +endif @$(call install_finish, xorg-font-adobe-100dpi) @$(call touch, $@) diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make index c1eb27dd8..155036309 100644 --- a/rules/xorg-font-adobe-75dpi.make +++ b/rules/xorg-font-adobe-75dpi.make @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-adobe-75dpi.targetinstall: $(xorg-font-adobe-75dpi_targeti @$(call install_fixup, xorg-font-adobe-75dpi,DESCRIPTION,missing) @cd $(XORG_FONT_ADOBE_75DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ - done + for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_ADOBE_75DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_ADOBE_75DPI_TRANS + @cd $(XORG_FONT_ADOBE_75DPI_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-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-adobe-75dpi) diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make index 568d81f6a..9f8c9989a 100644 --- a/rules/xorg-font-adobe-utopia-100dpi.make +++ b/rules/xorg-font-adobe-utopia-100dpi.make @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-adobe-utopia-100dpi.targetinstall: $(xorg-font-adobe-utopi @$(call install_fixup, xorg-font-adobe-utopia-100dpi,DESCRIPTION,missing) @cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-adobe-utopia-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-adobe-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-adobe-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI_TRANS + @cd $(XORG_FONT_ADOBE_UTOPIA_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-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-adobe-utopia-100dpi) diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make index b8fd52c24..1ba577d48 100644 --- a/rules/xorg-font-adobe-utopia-75dpi.make +++ b/rules/xorg-font-adobe-utopia-75dpi.make @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-adobe-utopia-75dpi.targetinstall: $(xorg-font-adobe-utopia @$(call install_fixup, xorg-font-adobe-utopia-75dpi,DESCRIPTION,missing) @cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ - done + for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ + if [ -e $$file ];then \ + $(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ];then \ + $(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI_TRANS + @cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_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-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-adobe-utopia-75dpi) diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make index 25427df4c..4461817e4 100644 --- a/rules/xorg-font-bh-100dpi.make +++ b/rules/xorg-font-bh-100dpi.make @@ -82,7 +82,7 @@ xorg-font-bh-100dpi_compile: $(STATEDIR)/xorg-font-bh-100dpi.compile $(STATEDIR)/xorg-font-bh-100dpi.compile: $(xorg-font-bh-100dpi_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_FONT_BH_100DPI_DIR) && $(XORG_FONT_BH_100DPI_PATH) make + cd $(XORG_FONT_BH_100DPI_DIR) && $(XORG_FONT_BH_100DPI_PATH) make UTIL_DIR=$(SYSROOT)/usr/lib/X11/fonts/util/ @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-bh-100dpi.targetinstall: $(xorg-font-bh-100dpi_targetinsta @$(call install_fixup, xorg-font-bh-100dpi,DESCRIPTION,missing) @cd $(XORG_FONT_BH_100DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-bh-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-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_BH_100DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_BH_100DPI_TRANS + @cd $(XORG_FONT_BH_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-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-bh-100dpi) diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make index e8aed936f..6ac178c44 100644 --- a/rules/xorg-font-bh-75dpi.make +++ b/rules/xorg-font-bh-75dpi.make @@ -82,7 +82,7 @@ xorg-font-bh-75dpi_compile: $(STATEDIR)/xorg-font-bh-75dpi.compile $(STATEDIR)/xorg-font-bh-75dpi.compile: $(xorg-font-bh-75dpi_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_FONT_BH_75DPI_DIR) && $(XORG_FONT_BH_75DPI_PATH) make + cd $(XORG_FONT_BH_75DPI_DIR) && $(XORG_FONT_BH_75DPI_PATH) make UTIL_DIR=$(SYSROOT)/usr/lib/X11/fonts/util/ @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-bh-75dpi.targetinstall: $(xorg-font-bh-75dpi_targetinstall @$(call install_fixup, xorg-font-bh-75dpi,DESCRIPTION,missing) @cd $(XORG_FONT_BH_75DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ - done + for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_BH_75DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_BH_75DPI_TRANS + @cd $(XORG_FONT_BH_75DPI_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-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-bh-75dpi) 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) diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make index bb5410b3d..93ebf6fb7 100644 --- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make @@ -82,7 +82,7 @@ xorg-font-bh-lucidatypewriter-75dpi_compile: $(STATEDIR)/xorg-font-bh-lucidatype $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.compile: $(xorg-font-bh-lucidatypewriter-75dpi_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR) && $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_PATH) make + cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR) && $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_PATH) make UTIL_DIR=$(SYSROOT)/usr/lib/X11/fonts/util/ @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.targetinstall: $(xorg-font-bh-lu @$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,DESCRIPTION,missing) @cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-bh-lucidatypewriter-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$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-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-lucidatypewriter-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_TRANS + @cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_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-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-bh-lucidatypewriter-75dpi) diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make index 970265dfb..7a8243b12 100644 --- a/rules/xorg-font-bh-ttf.make +++ b/rules/xorg-font-bh-ttf.make @@ -113,7 +113,12 @@ $(STATEDIR)/xorg-font-bh-ttf.targetinstall: $(xorg-font-bh-ttf_targetinstall_dep @$(call install_fixup, xorg-font-bh-ttf,DEPENDS,) @$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing) -#FIXME + @cd $(XORG_FONT_BH_TTF_DIR); \ + for file in *.ttf; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bh-ttf, 0, 0, 0644, $$file, $(XORG_FONTDIR)/truetype/$$file, n); \ + fi; \ + done; @$(call install_finish, xorg-font-bh-ttf) diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make index 98bfe170e..30cdbce09 100644 --- a/rules/xorg-font-bitstream-100dpi.make +++ b/rules/xorg-font-bitstream-100dpi.make @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-bitstream-100dpi.targetinstall: $(xorg-font-bitstream-100d @$(call install_fixup, xorg-font-bitstream-100dpi,DESCRIPTION,missing) @cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-bitstream-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-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ];then \ + $(call install_copy, xorg-font-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_BITSTREAM_100DPI_TRANS + @cd $(XORG_FONT_BITSTREAM_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-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-bitstream-100dpi) diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make index 4463af32f..5338c0ff3 100644 --- a/rules/xorg-font-bitstream-75dpi.make +++ b/rules/xorg-font-bitstream-75dpi.make @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-bitstream-75dpi.targetinstall: $(xorg-font-bitstream-75dpi @$(call install_fixup, xorg-font-bitstream-75dpi,DESCRIPTION,missing) @cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ - done + for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \ + for file in *{ISO8859-15,ISO8859-1}.pcf.gz; do \ + if [ -e $$file ];then \ + $(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_BITSTREAM_75DPI_TRANS + @cd $(XORG_FONT_BITSTREAM_75DPI_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-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-bitstream-75dpi) diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make index 6e179b68f..1400b929f 100644 --- a/rules/xorg-font-misc-misc.make +++ b/rules/xorg-font-misc-misc.make @@ -114,9 +114,27 @@ $(STATEDIR)/xorg-font-misc-misc.targetinstall: $(xorg-font-misc-misc_targetinsta @$(call install_fixup, xorg-font-misc-misc,DESCRIPTION,missing) @cd $(XORG_FONT_MISC_MISC_DIR); \ - for file in *.pcf.gz; do \ - $(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \ - done + for file in `find . -name "*.pcf.gz" -a \! -name "*ISO8859*"`; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \ + fi; \ + done; + + @cd $(XORG_FONT_MISC_MISC_DIR); \ + for file in *{ISO8859-15,ISO8859-1,ISO8859-16,ISO8859-11}.pcf.gz; do \ + if [ -e $$file ]; then \ + $(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \ + fi; \ + done; + +ifdef PTXCONF_XORG_FONT_MISC_MISC_TRANS + @cd $(XORG_FONT_MISC_MISC_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-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \ + fi; \ + done; +endif @$(call install_finish, xorg-font-misc-misc) |