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

(-)a/Makefile.PL (-6 / +3 lines)
Lines 304-313 my $target_map = { Link Here
304
  './authorities'               => 'INTRANET_CGI_DIR',
304
  './authorities'               => 'INTRANET_CGI_DIR',
305
  './basket'                    => 'INTRANET_CGI_DIR',
305
  './basket'                    => 'INTRANET_CGI_DIR',
306
  './bin'                       => { target => 'SCRIPT_DIR', trimdir => -1 },
306
  './bin'                       => { target => 'SCRIPT_DIR', trimdir => -1 },
307
  './C4'                        => 'PERL_MODULE_DIR',
307
  './lib/C4/SIP/t'                  => 'NONE',
308
  './C4/SIP/t'                  => 'NONE',
308
  './lib/C4/SIP/koha_test'          => 'NONE',
309
  './C4/SIP/koha_test'          => 'NONE',
309
  './lib/C4/tests'                  => 'NONE',
310
  './C4/tests'                  => 'NONE',
311
  './catalogue'                 => 'INTRANET_CGI_DIR',
310
  './catalogue'                 => 'INTRANET_CGI_DIR',
312
  './cataloguing'               => 'INTRANET_CGI_DIR',
311
  './cataloguing'               => 'INTRANET_CGI_DIR',
313
  './changelanguage.pl'         => 'INTRANET_CGI_DIR',
312
  './changelanguage.pl'         => 'INTRANET_CGI_DIR',
Lines 328-335 my $target_map = { Link Here
328
  './installer-CPAN.pl'         => 'NONE',
327
  './installer-CPAN.pl'         => 'NONE',
329
  './installer'                 => 'INTRANET_CGI_DIR',
328
  './installer'                 => 'INTRANET_CGI_DIR',
330
  './errors'                    => {target => 'INTRANET_CGI_DIR'},
329
  './errors'                    => {target => 'INTRANET_CGI_DIR'},
331
  './Koha'                      => 'PERL_MODULE_DIR',
332
  './Koha.pm'                   => 'PERL_MODULE_DIR',
333
  './koha-tmpl/intranet-tmpl'   => {target => 'INTRANET_TMPL_DIR', trimdir => -1},
330
  './koha-tmpl/intranet-tmpl'   => {target => 'INTRANET_TMPL_DIR', trimdir => -1},
334
  './koha-tmpl/opac-tmpl'       => {target => 'OPAC_TMPL_DIR', trimdir => -1},
331
  './koha-tmpl/opac-tmpl'       => {target => 'OPAC_TMPL_DIR', trimdir => -1},
335
  './kohaversion.pl'            => 'INTRANET_CGI_DIR',
332
  './kohaversion.pl'            => 'INTRANET_CGI_DIR',
(-)a/debian/scripts/koha-functions.sh (-1 / +1 lines)
Lines 330-336 adjust_paths_dev_install() Link Here
330
    if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then
330
    if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then
331
        DEV_INSTALL=1
331
        DEV_INSTALL=1
332
        KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir)
332
        KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir)
333
        PERL5LIB="$KOHA_HOME:$KOHA_HOME/lib"
333
        PERL5LIB="$KOHA_HOME/lib"
334
    else
334
    else
335
        DEV_INSTALL=""
335
        DEV_INSTALL=""
336
    fi
336
    fi
(-)a/debian/scripts/koha-sip (-5 / +1 lines)
Lines 70-80 start_sip() Link Here
70
            adjust_paths_dev_install $name
70
            adjust_paths_dev_install $name
71
            export KOHA_HOME PERL5LIB
71
            export KOHA_HOME PERL5LIB
72
72
73
            if [ "$DEV_INSTALL" = "" ]; then
73
            LIBDIR=$KOHA_HOME/lib
74
                LIBDIR=$KOHA_HOME/lib
75
            else
76
                LIBDIR=$KOHA_HOME
77
            fi
78
74
79
            DAEMONOPTS="--name=${name}-koha-sip \
75
            DAEMONOPTS="--name=${name}-koha-sip \
80
                    --errlog=/var/log/koha/${name}/sip-error.log \
76
                    --errlog=/var/log/koha/${name}/sip-error.log \
(-)a/t/00-load.t (-3 / +2 lines)
Lines 31-37 use English qw( -no_match_vars ); Link Here
31
=cut
31
=cut
32
32
33
# Loop through the C4:: modules
33
# Loop through the C4:: modules
34
my $lib = File::Spec->rel2abs('C4');
34
my $lib = File::Spec->rel2abs('lib/C4');
35
find({
35
find({
36
    bydepth => 1,
36
    bydepth => 1,
37
    no_chdir => 1,
37
    no_chdir => 1,
Lines 48-54 find({ Link Here
48
}, $lib);
48
}, $lib);
49
49
50
# Loop through the Koha:: modules
50
# Loop through the Koha:: modules
51
$lib = File::Spec->rel2abs('Koha');
51
$lib = File::Spec->rel2abs('lib/Koha');
52
find(
52
find(
53
    {
53
    {
54
        bydepth  => 1,
54
        bydepth  => 1,
55
- 

Return to bug 28589