From e59ebe938a93cab552780171f93eefe7a0fd04a6 Mon Sep 17 00:00:00 2001 From: Mason James Date: Fri, 29 Nov 2019 12:11:15 +0000 Subject: [PATCH] Bug 24445: Add z3950 to makefile (bug 13937 follow-up) Signed-off-by: Martin Renvoize --- Makefile.PL | 5 +++++ debian/koha-common.install | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.PL b/Makefile.PL index 184752e923..18ae802387 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -320,6 +320,7 @@ my $target_map = { './offline_circ' => 'INTRANET_CGI_DIR', './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, './etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 }, + './etc/z3950' => { target => 'Z3950_CONF_DIR', trimdir => -1 }, './etc/pazpar2' => { target => 'PAZPAR2_CONF_DIR', trimdir => -1 }, './help.pl' => 'INTRANET_CGI_DIR', './ill' => 'INTRANET_CGI_DIR', @@ -661,6 +662,7 @@ $config{ZEBRA_PTOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu' my %test_suite_override_dirs = ( KOHA_CONF_DIR => ['etc'], ZEBRA_CONF_DIR => ['etc', 'zebradb'], + Z3950_CONF_DIR => ['etc', 'z3950'], LOG_DIR => ['var', 'log'], BACKUP_DIR => ['var', 'spool'], SCRIPT_DIR => ['bin'], @@ -1382,6 +1384,7 @@ sub get_target_directories { $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib'); $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc'); $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb'); + $dirmap{'Z3950_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'z3950'); $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2'); $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc'); $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin'); @@ -1414,6 +1417,7 @@ sub get_target_directories { $skipdirs{'PERL_MODULE_DIR'} = 1; $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc'); $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb'); + $dirmap{'Z3950_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'z3950'); $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2'); $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc'); $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin'); @@ -1441,6 +1445,7 @@ sub get_target_directories { $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib'); $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package); $dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'zebradb'); + $dirmap{'Z3950_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'z3950'); $dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'pazpar2'); $dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc'); $dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin'); diff --git a/debian/koha-common.install b/debian/koha-common.install index 2ebfcc9e54..a44497c0ca 100644 --- a/debian/koha-common.install +++ b/debian/koha-common.install @@ -2,8 +2,8 @@ debian/tmp/usr/* usr debian/tmp/etc/koha/searchengine debian/tmp/etc/koha/pazpar2 debian/tmp/etc/koha/zebradb/[!z]* +debian/tmp/etc/koha/z3950 debian/templates/* etc/koha -debian/tmp/etc/z3950 etc/koha debian/koha-post-install-setup usr/sbin debian/unavailable.html usr/share/koha/intranet/htdocs debian/unavailable.html usr/share/koha/opac/htdocs -- 2.39.5