Bug 15632: Koha::Patron::Messages - (follow-up) Remove AddMessage

[srvgit] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 4b89524..24d2ad3 100644 (file)
--- 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
@@ -279,9 +283,10 @@ my $target_map = {
   './installer'                 => 'INTRANET_CGI_DIR',
   './errors'                    => {target => 'INTRANET_CGI_DIR'},
   './Koha'                      => 'PERL_MODULE_DIR',
+  './Koha.pm'                   => 'PERL_MODULE_DIR',
   './koha-tmpl/intranet-tmpl'   => {target => 'INTRANET_TMPL_DIR', trimdir => -1},
   './koha-tmpl/opac-tmpl'       => {target => 'OPAC_TMPL_DIR', trimdir => -1},
-  './kohaversion.pl'            => 'INTRANET_CGI_DIR', 
+  './kohaversion.pl'            => 'INTRANET_CGI_DIR',
   './labels'                    => 'INTRANET_CGI_DIR',
   './mainpage.pl'               => 'INTRANET_CGI_DIR',
   './Makefile.PL'               => 'NONE',
@@ -441,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
@@ -496,6 +502,7 @@ my $pl_files = {
       'rewrite-config.PL' => [
          'blib/KOHA_CONF_DIR/koha-conf.xml',
          'blib/KOHA_CONF_DIR/koha-httpd.conf',
+         'blib/KOHA_CONF_DIR/log4perl.conf',
          'blib/ZEBRA_CONF_DIR/etc/default.idx',
          'blib/MISC_DIR/koha-install-log'
          ],
@@ -1080,6 +1087,9 @@ 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(