Attachment #97495 for bug #24445

View | Details | Raw Unified | Return to bug 24445
Collapse All | Expand All




  './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',

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'],

        $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');

        $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');

        $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');

Lines 2-9 debian/tmp/usr/* usr Link Here

(-)a/debian/koha-common.install (-2 / +1 lines)
2	debian/tmp/etc/koha/searchengine	2	debian/tmp/etc/koha/searchengine
3	debian/tmp/etc/koha/pazpar2	3	debian/tmp/etc/koha/pazpar2
4	debian/tmp/etc/koha/zebradb/[!z]*	4	debian/tmp/etc/koha/zebradb/[!z]*
		5	debian/tmp/etc/koha/z3950
5	debian/templates/* etc/koha	6	debian/templates/* etc/koha
6	debian/tmp/etc/z3950 etc/koha
7	debian/koha-post-install-setup usr/sbin	7	debian/koha-post-install-setup usr/sbin
8	debian/unavailable.html usr/share/koha/intranet/htdocs	8	debian/unavailable.html usr/share/koha/intranet/htdocs
9	debian/unavailable.html usr/share/koha/opac/htdocs	9	debian/unavailable.html usr/share/koha/opac/htdocs
10	-

Return to bug 24445

Lines 320-325 my $target_map = { Link Here

(-)a/Makefile.PL (+5 lines)
320	'./offline_circ' => 'INTRANET_CGI_DIR',	320	'./offline_circ' => 'INTRANET_CGI_DIR',
321	'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },	321	'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },
322	'./etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },	322	'./etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },
		323	'./etc/z3950' => { target => 'Z3950_CONF_DIR', trimdir => -1 },
323	'./etc/pazpar2' => { target => 'PAZPAR2_CONF_DIR', trimdir => -1 },	324	'./etc/pazpar2' => { target => 'PAZPAR2_CONF_DIR', trimdir => -1 },
324	'./help.pl' => 'INTRANET_CGI_DIR',	325	'./help.pl' => 'INTRANET_CGI_DIR',
325	'./ill' => 'INTRANET_CGI_DIR',	326	'./ill' => 'INTRANET_CGI_DIR',
Lines 661-666 $config{ZEBRA_PTOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu' Link Here
661	my %test_suite_override_dirs = (	662	my %test_suite_override_dirs = (
662	KOHA_CONF_DIR => ['etc'],	663	KOHA_CONF_DIR => ['etc'],
663	ZEBRA_CONF_DIR => ['etc', 'zebradb'],	664	ZEBRA_CONF_DIR => ['etc', 'zebradb'],
		665	Z3950_CONF_DIR => ['etc', 'z3950'],
664	LOG_DIR => ['var', 'log'],	666	LOG_DIR => ['var', 'log'],
665	BACKUP_DIR => ['var', 'spool'],	667	BACKUP_DIR => ['var', 'spool'],
666	SCRIPT_DIR => ['bin'],	668	SCRIPT_DIR => ['bin'],
Lines 1382-1387 sub get_target_directories { Link Here
1382	$dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');	1384	$dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1383	$dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');	1385	$dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
1384	$dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');	1386	$dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');
		1387	$dirmap{'Z3950_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'z3950');
1385	$dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');	1388	$dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');
1386	$dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');	1389	$dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
1387	$dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');	1390	$dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');
Lines 1414-1419 sub get_target_directories { Link Here
1414	$skipdirs{'PERL_MODULE_DIR'} = 1;	1417	$skipdirs{'PERL_MODULE_DIR'} = 1;
1415	$dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');	1418	$dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
1416	$dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');	1419	$dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'zebradb');
		1420	$dirmap{'Z3950_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'z3950');
1417	$dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');	1421	$dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc', 'pazpar2');
1418	$dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');	1422	$dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
1419	$dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');	1423	$dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');
Lines 1441-1446 sub get_target_directories { Link Here
1441	$dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');	1445	$dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1442	$dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package);	1446	$dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package);
1443	$dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'zebradb');	1447	$dirmap{'ZEBRA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'zebradb');
		1448	$dirmap{'Z3950_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'z3950');
1444	$dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'pazpar2');	1449	$dirmap{'PAZPAR2_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package, 'pazpar2');
1445	$dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');	1450	$dirmap{'MISC_DIR'} = File::Spec->catdir(@basedir, $package, 'misc');
1446	$dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');	1451	$dirmap{'SCRIPT_DIR'} = File::Spec->catdir(@basedir, $package, 'bin');