diff --git a/Makefile.PL b/Makefile.PL index 96d2fb7fa7..e4ff75b180 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -240,6 +240,10 @@ Directory for external Koha plugins. Directory for PazPar2 configuration files. +=item FONT_DIR + +Directory where DejaVu fonts are installed. + =item NONE This is a dummy target used to explicitly state @@ -442,7 +446,8 @@ my %config_defaults = ( 'PATH_TO_ZEBRA' => '', 'USE_MEMCACHED' => 'no', 'MEMCACHED_SERVERS' => '127.0.0.1:11211', - 'MEMCACHED_NAMESPACE' => 'KOHA' + 'MEMCACHED_NAMESPACE' => 'KOHA', + 'FONT_DIR' => '/usr/share/fonts/truetype/ttf-dejavu' ); # set some default configuration options based on OS @@ -1081,6 +1086,8 @@ Memcached namespace?); $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values); } + $msg = q(Path to DejaVu fonts?); + $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values); $msg = q( diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml index 289d51d163..0c22385275 100644 --- a/etc/koha-conf.xml +++ b/etc/koha-conf.xml @@ -117,18 +117,18 @@ __PAZPAR2_TOGGLE_XML_POST__ - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf + __FONT_DIR__/DejaVuSerif.ttf + __FONT_DIR__/DejaVuSerif-Bold.ttf + __FONT_DIR__/DejaVuSerif-Italic.ttf + __FONT_DIR__/DejaVuSerif-BoldItalic.ttf + __FONT_DIR__/DejaVuSansMono.ttf + __FONT_DIR__/DejaVuSansMono-Bold.ttf + __FONT_DIR__/DejaVuSansMono-Oblique.ttf + __FONT_DIR__/DejaVuSansMono-BoldOblique.ttf + __FONT_DIR__/DejaVuSans.ttf + __FONT_DIR__/DejaVuSans-Oblique.ttf + __FONT_DIR__/DejaVuSans-Bold.ttf + __FONT_DIR__/DejaVuSans-BoldOblique.ttf diff --git a/rewrite-config.PL b/rewrite-config.PL index 91f74cb661..3239a59663 100644 --- a/rewrite-config.PL +++ b/rewrite-config.PL @@ -147,6 +147,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr"; "__USE_MEMCACHED__" => 'no', "__MEMCACHED_SERVERS__" => "", "__MEMCACHED_NAMESPACE__" => "", + "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu", ); # Override configuration from the environment