X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=c7600b00e5c4de272c7a59fdc1fbcb7de986df50;hb=6f3741f69f052f74b3f66eccb35b646f8337e732;hp=1a3eb3c51a9eb5f62efbab7d2d8cc88b65d486fa;hpb=0b989fe0b2097d747da1fd6d04aa8aecc5652d06;p=srvgit

diff --git a/Makefile.PL b/Makefile.PL
index 1a3eb3c51a..c7600b00e5 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -186,7 +186,9 @@ Directory for Zebra configuration files.
 
 =item ZEBRA_LOCK_DIR
 
-Directory for Zebra's lock files.
+Directory for Zebra's lock files.  This includes subdirs for authorities,
+biblios, and the zebra rebuild function.  Any activity to reindex
+zebra from koha should interlock here with rebuild_zebra.pl.
 
 =item ZEBRA_DATA_DIR
 
@@ -318,6 +320,7 @@ my $target_map = {
   './skel/var/lib/koha/zebradb/biblios/register'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
   './skel/var/lib/koha/zebradb/biblios/shadow'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
   './skel/var/lib/koha/zebradb/biblios/tmp'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
+  './skel/var/lock/koha/zebradb/rebuild' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
   './skel/var/lib/koha/plugins' => { target => 'PLUGINS_DIR', trimdir => 6 },
   './sms'                       => 'INTRANET_CGI_DIR',
   './suggestion'                => 'INTRANET_CGI_DIR',
@@ -557,6 +560,10 @@ $config{ZEBRA_TOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
     ? 'icuchain words-icu.xml'
     : 'charmap word-phrase-utf.chr';
 
+$config{ZEBRA_PTOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
+    ? 'icuchain phrases-icu.xml'
+    : 'charmap word-phrase-utf.chr';
+
 my %test_suite_override_dirs = (
     KOHA_CONF_DIR  => ['etc'],
     ZEBRA_CONF_DIR => ['etc', 'zebradb'],
@@ -912,8 +919,8 @@ database to be used by Koha);
 
     print q(
 Koha uses the Zebra search engine for high-performance
-searching of bibliographic and authority records.  If you
-have installed the Zebra software
+searching of bibliographic and authority records.  Checking
+to see if you have installed the Zebra software...
 );
 
     if (defined(my $zebra_path = find_zebra())) {