From 83427483779c45ff090055fbe699700dbea7f223 Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 19 Dec 2007 14:29:38 -0600
Subject: [PATCH 1/2] installer: munge ZEBRA_PASS only when INSTALL_ZEBRA=yes

---
 Makefile.PL | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 114bf3f93f..c65f839f03 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1165,7 +1165,9 @@ sub postamble {
     # quote '$' in the two password parameters
     my %config = %config;
     $config{'DB_PASS'} =~ s/\$/\$\$/g;
-    $config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
+    if ($config{'INSTALL_ZEBRA'} eq "yes") {
+        $config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
+    }
 
 	# Hereagain, we must alter syntax per platform...
 	if ( $^O eq 'MSWin32' ) {

From 1dbc30ee4e9ccbf11ab5e636d59307ab0b1556ff Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 19 Dec 2007 14:43:23 -0600
Subject: [PATCH 2/2] bug 1676: fixed location of OPAC_CGI_DIR for 'dev'
 install

---
 Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index c65f839f03..8a42a1c39f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -956,7 +956,7 @@ sub get_target_directories {
         $skipdirs{'INTRANET_TMPL_DIR'} = 1;
         $dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
         $skipdirs{'INTRANET_WWW_DIR'} = 1;
-        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir, 'opac');
+        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir);
         $skipdirs{'OPAC_CGI_DIR'} = 1;
         $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'opac-tmpl');
         $skipdirs{'OPAC_TMPL_DIR'} = 1;