cleanup of opac-search.pl, synch with search.pl, etc.

[koha_fer] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 98b000b..353f3dc 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -516,6 +516,7 @@ WriteMakefile(
 'Test::More' => 0.62,
 'Text::CSV' => 0.01,
 'Text::CSV_XS' => 0.32,
+'Text::Iconv' => 1.7,
 'Text::Wrap' => 2005.082401,
 'Time::HiRes' => 1.86,
 'Time::localtime' => 1.02,
@@ -1108,6 +1109,9 @@ sub test {
     my $self = shift;
     my $test = $self->SUPER::test(@_);
     $test =~ s!\$\(INST_LIB\)!blib/PERL_MODULE_DIR!g;
+
+    # set KOHA_CONF 
+    $test =~ s!\$\(FULLPERLRUN\)!KOHA_CONF=blib/KOHA_CONF_DIR/koha-conf.xml \$(FULLPERLRUN)!g;
     return $test;
 }
 
@@ -1198,9 +1202,29 @@ install :: all install_koha warn_koha_env_vars
     $install .= "\t\$(NOECHO) \$(ECHO) For other post-installation tasks, please consult the README.\n";
     $install .= "\t\$(NOECHO) \$(ECHO)\n";
 
+    if ($config{'INSTALL_ZEBRA'} eq "yes") {
+        $install .= _update_zebra_conf_target();
+    }
+
     return $install;
 }
 
+=head 2 _update_zebra_conf_target
+
+Add an installation target for updating
+Zebra's configuration files.
+
+=cut
+
+sub _update_zebra_conf_target {
+
+    my $target = "\nupdate_zebra_conf ::\n";
+    $target   .= "\tumask 022; \$(MOD_INSTALL) \\\n";
+    $target .= "\t\t\$(KOHA_INST_ZEBRA_CONF_DIR) \$(KOHA_DEST_ZEBRA_CONF_DIR) \n";
+
+    return $target;
+}
+
 sub postamble {
     # put directory mappings into Makefile
     # so that Make will export as environment