diff options
| author | Erwin Rol <erwin@erwinrol.com> | 2010-01-22 13:04:11 +0100 |
|---|---|---|
| committer | Erwin Rol <erwin@erwinrol.com> | 2010-02-01 13:57:55 +0100 |
| commit | d3f2416a857f5b6f87ae5b14c727a56f4e8c9061 (patch) | |
| tree | 873278ac15c9d68b3996680c63106d00208e17ae /rules | |
| parent | 3fcb71f21b1cbfb3d4e15983371645658361638f (diff) | |
| download | ptxdist-d3f2416a857f5b6f87ae5b14c727a56f4e8c9061.tar.gz ptxdist-d3f2416a857f5b6f87ae5b14c727a56f4e8c9061.tar.xz | |
[fontconfig] Add custom fonts.conf option
Add custom fonts.conf option via the alternatives mechanism.
Add menu option to instell fonts.dtd file
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/fontconfig.in | 31 | ||||
| -rw-r--r-- | rules/fontconfig.make | 13 |
2 files changed, 39 insertions, 5 deletions
diff --git a/rules/fontconfig.in b/rules/fontconfig.in index dbb716c09..fe84f2f3b 100644 --- a/rules/fontconfig.in +++ b/rules/fontconfig.in @@ -34,11 +34,34 @@ config FONTCONFIG_UTILS builds font information cache files for applications using fontconfig for their font handling. -config FONTCONFIG_CONFS - bool "install configuration files for Fontconfig" +config FONTCONFIG_DTD + bool "install DTD file for Fontconfig" default y help - This installs configuration files of fontconfig, - subpixeling is turned on by default + This installs the fonts.dtd file. + +choice + prompt "install configuration files for Fontconfig" + default FONTCONFIG_CONFS_DEFAULT + + config FONTCONFIG_CONFS_NONE + bool "don't install config file" + help + Choose this if you don't want to install + a fonts.conf file. + + config FONTCONFIG_CONFS_DEFAULT + bool "default config" + help + This installs a default fonts.conf file of fontconfig, + subpixeling is turned on by default. + + config FONTCONFIG_CONFS_CUSTOM + bool "custom config" + help + This installs a custom fonts.conf file of fontconfig. + +endchoice endif + diff --git a/rules/fontconfig.make b/rules/fontconfig.make index 31abf607f..d35be1df5 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -86,7 +86,13 @@ $(STATEDIR)/fontconfig.targetinstall: libfontconfig.so.1.3.0, \ /usr/lib/libfontconfig.so) -ifdef PTXCONF_FONTCONFIG_CONFS + +ifdef PTXCONF_FONTCONFIG_DTD + @$(call install_copy, fontconfig, 0, 0, 0644, -, \ + /etc/fonts/fonts.dtd,n) +endif + +ifdef PTXCONF_FONTCONFIG_CONFS_DEFAULT @$(call install_copy, fontconfig, 0, 0, 0644, -, \ /etc/fonts/fonts.conf,n) @@ -99,6 +105,11 @@ ifdef PTXCONF_FONTCONFIG_CONFS # /etc/fonts/conf.d/autohint.conf,n) endif +ifdef PTXCONF_FONTCONFIG_CONFS_CUSTOM + @$(call install_alternative, fontconfig, 0, 0, 0644, \ + /etc/fonts/fonts.conf) +endif + ifdef PTXCONF_FONTCONFIG_UTILS @$(call install_copy, fontconfig, 0, 0, 0755, -, \ /usr/bin/fc-cache) |