From a685952c8604994db6c755b2f8cfa7fa3391493f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 23 Jun 2021 12:19:05 +0200 Subject: [PATCH] Bug 28589: lib dir adjustements --- Makefile.PL | 9 +++------ debian/scripts/koha-functions.sh | 2 +- debian/scripts/koha-sip | 6 +----- t/00-load.t | 4 ++-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index b044dd165ca..527ced26fce 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -304,10 +304,9 @@ my $target_map = { './authorities' => 'INTRANET_CGI_DIR', './basket' => 'INTRANET_CGI_DIR', './bin' => { target => 'SCRIPT_DIR', trimdir => -1 }, - './C4' => 'PERL_MODULE_DIR', - './C4/SIP/t' => 'NONE', - './C4/SIP/koha_test' => 'NONE', - './C4/tests' => 'NONE', + './lib/C4/SIP/t' => 'NONE', + './lib/C4/SIP/koha_test' => 'NONE', + './lib/C4/tests' => 'NONE', './catalogue' => 'INTRANET_CGI_DIR', './cataloguing' => 'INTRANET_CGI_DIR', './changelanguage.pl' => 'INTRANET_CGI_DIR', @@ -328,8 +327,6 @@ my $target_map = { './installer-CPAN.pl' => 'NONE', './installer' => 'INTRANET_CGI_DIR', './errors' => {target => 'INTRANET_CGI_DIR'}, - './Koha' => 'PERL_MODULE_DIR', - './Koha.pm' => 'PERL_MODULE_DIR', './koha-tmpl/intranet-tmpl' => {target => 'INTRANET_TMPL_DIR', trimdir => -1}, './koha-tmpl/opac-tmpl' => {target => 'OPAC_TMPL_DIR', trimdir => -1}, './kohaversion.pl' => 'INTRANET_CGI_DIR', diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh index 8888ad62904..8e684b0cd5d 100755 --- a/debian/scripts/koha-functions.sh +++ b/debian/scripts/koha-functions.sh @@ -330,7 +330,7 @@ adjust_paths_dev_install() if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then DEV_INSTALL=1 KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir) - PERL5LIB="$KOHA_HOME:$KOHA_HOME/lib" + PERL5LIB="$KOHA_HOME/lib" else DEV_INSTALL="" fi diff --git a/debian/scripts/koha-sip b/debian/scripts/koha-sip index 402e9fa2e3e..48fbec93bd0 100755 --- a/debian/scripts/koha-sip +++ b/debian/scripts/koha-sip @@ -70,11 +70,7 @@ start_sip() adjust_paths_dev_install $name export KOHA_HOME PERL5LIB - if [ "$DEV_INSTALL" = "" ]; then - LIBDIR=$KOHA_HOME/lib - else - LIBDIR=$KOHA_HOME - fi + LIBDIR=$KOHA_HOME/lib DAEMONOPTS="--name=${name}-koha-sip \ --errlog=/var/log/koha/${name}/sip-error.log \ diff --git a/t/00-load.t b/t/00-load.t index d518f34fd19..12b0af7db4b 100755 --- a/t/00-load.t +++ b/t/00-load.t @@ -31,7 +31,7 @@ use English qw( -no_match_vars ); =cut # Loop through the C4:: modules -my $lib = File::Spec->rel2abs('C4'); +my $lib = File::Spec->rel2abs('lib/C4'); find({ bydepth => 1, no_chdir => 1, @@ -48,7 +48,7 @@ find({ }, $lib); # Loop through the Koha:: modules -$lib = File::Spec->rel2abs('Koha'); +$lib = File::Spec->rel2abs('lib/Koha'); find( { bydepth => 1, -- 2.20.1