From 58fd9fbea35bcdf75c73ef10ee7c38a2fa5dc007 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 3 Aug 2016 14:34:12 -0300 Subject: [PATCH] Bug 17044: Fix wrong destination for 'api' directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The original Makefile.PL tweak missed to trim the directory name thus repeating the 'api' directory like in 'api/api'. To test: - Make a standard install (for example in /usr/share/koha => FAIL: check /usr/share/koha/api/api exists - Make a single install (for example in /home/tcohen/koha-single) => FAIL: check /home/tcohen/koha-single/api/api exists - Apply the patch - Make a standard install (for example in /usr/share/koha => SUCCESS: check /usr/share/koha/api exists and doesn't contain a nested 'api' dir - Make a single install (for example in /home/tcohen/koha-single) => SUCCESS: check /home/tcohen/koha-single/api exists and doesn't contain a nested 'api' dir - Sign off :-D Note: this affects the packages too, as the standard install is used as a basis. Signed-off-by: Benjamin Rokseth Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 72d92be918eae8a9bc3c6723c155d1b0c6ba25e4) Signed-off-by: Frédéric Demians --- Makefile.PL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index f0a936895d..fd0725bba0 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -260,7 +260,7 @@ my $target_map = { './about.pl' => 'INTRANET_CGI_DIR', './acqui' => 'INTRANET_CGI_DIR', './admin' => 'INTRANET_CGI_DIR', - './api' => 'API_CGI_DIR', + './api' => { target => 'API_CGI_DIR', trimdir => -1 }, './authorities' => 'INTRANET_CGI_DIR', './basket' => 'INTRANET_CGI_DIR', './C4' => 'PERL_MODULE_DIR', @@ -274,7 +274,7 @@ my $target_map = { './circ' => 'INTRANET_CGI_DIR', './course_reserves' => 'INTRANET_CGI_DIR', './docs/history.txt' => { target => 'DOC_DIR', trimdir => -1 }, - './offline_circ' => 'INTRANET_CGI_DIR', + './offline_circ' => 'INTRANET_CGI_DIR', './edithelp.pl' => 'INTRANET_CGI_DIR', './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, './etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 }, -- 2.39.5