Attachment 54048 Details for Bug 17044 – Bug 17044: Fix wrong destination for 'api' directory

[patch] Bug 17044: Fix wrong destination for 'api' directory

Bug-17044-Fix-wrong-destination-for-api-directory.patch (text/plain), 2.33 KB, created by Jonathan Druart on 2016-08-05 14:29:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-08-05 14:29:04 UTC

Size: 2.33 KB

patch

obsolete

>From bfe6ccd93f74fc258433d0833f6489c2fe4ba7ad Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Wed, 3 Aug 2016 14:34:12 -0300
>Subject: [PATCH] Bug 17044: Fix wrong destination for 'api' directory
>
>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 <benjamin.rokseth@kul.oslo.kommune.no>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> Makefile.PL | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/Makefile.PL b/Makefile.PL
>index f0a9368..fd0725b 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.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 17044: 53964 | 53974 | 54048