diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-03 16:22:27 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-03 16:22:27 +0000 |
| commit | aa6176e17006ebfb0987afd52a1e712839c0485d (patch) | |
| tree | a3c6e103f115cc3da5d52763da0ccfee016bdb18 /rules/fontconfig.make | |
| parent | 6194ef398146e6c78e3daa1ef89dd0ce90ac0df9 (diff) | |
| download | ptxdist-aa6176e17006ebfb0987afd52a1e712839c0485d.tar.gz ptxdist-aa6176e17006ebfb0987afd52a1e712839c0485d.tar.xz | |
* fontconfig.make:
use X default fontpath,
fix install lib versions
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6713 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/fontconfig.make')
| -rw-r--r-- | rules/fontconfig.make | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/rules/fontconfig.make b/rules/fontconfig.make index bfd271648..09ed7b707 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -70,6 +70,7 @@ FONTCONFIG_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --disable-docs \ --with-cache-dir=/var/cache/fontconfig \ + --with-default-fonts=$(XORG_FONTDIR) \ --with-arch=$(PTXCONF_ARCH) $(STATEDIR)/fontconfig.prepare: $(fontconfig_prepare_deps_default) @@ -121,15 +122,15 @@ $(STATEDIR)/fontconfig.targetinstall: $(fontconfig_targetinstall_deps_default) @$(call install_fixup,fontconfig,DESCRIPTION,missing) @$(call install_copy, fontconfig, 0, 0, 0644, \ - $(FONTCONFIG_DIR)/src/.libs/libfontconfig.so.1.0.4, \ - /usr/lib/libfontconfig.so.1.0.4) + $(FONTCONFIG_DIR)/src/.libs/libfontconfig.so.1.2.0, \ + /usr/lib/libfontconfig.so.1.2.0) @$(call install_link, fontconfig, \ - libfontconfig.so.1.0.4, \ + libfontconfig.so.1.2.0, \ /usr/lib/libfontconfig.so.1) @$(call install_link, fontconfig, \ - libfontconfig.so.1.0.4, \ + libfontconfig.so.1.2.0, \ /usr/lib/libfontconfig.so) ifdef PTXCONF_FONTCONFIG_CONFS @@ -137,13 +138,13 @@ ifdef PTXCONF_FONTCONFIG_CONFS $(FONTCONFIG_DIR)/fonts.conf, \ /etc/fonts/fonts.conf,n) - @$(call install_copy, fontconfig, 0, 0, 0644, \ - $(FONTCONFIG_DIR)/conf.d/sub-pixel.conf, \ - /etc/fonts/conf.d/subpixel.conf,n) +# @$(call install_copy, fontconfig, 0, 0, 0644, \ +# $(FONTCONFIG_DIR)/conf.d/sub-pixel.conf, \ +# /etc/fonts/conf.d/subpixel.conf,n) - @$(call install_copy, fontconfig, 0, 0, 0644, \ - $(FONTCONFIG_DIR)/conf.d/autohint.conf, \ - /etc/fonts/conf.d/autohint.conf,n) +# @$(call install_copy, fontconfig, 0, 0, 0644, \ +# $(FONTCONFIG_DIR)/conf.d/autohint.conf, \ +# /etc/fonts/conf.d/autohint.conf,n) endif ifdef PTXCONF_FONTCONFIG_UTILS |