From 5baba50aedea3e4e11c1e258068a2aeed44f8897 Mon Sep 17 00:00:00 2001
From: Chris Cormack <crc@liblime.com>
Date: Tue, 20 Nov 2007 12:44:37 -0600
Subject: [PATCH] Shifted the opac out of koha so its now /usr/lib/cgi-bin/opac
 and /usr/lib/cgi-bin/koha by default, rewrite-config.PL and koha-httpd.conf
 updated

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 Makefile.PL         | 3 +++
 etc/koha-httpd.conf | 6 +++---
 rewrite-config.PL   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 97cfaa2b02..1441e2f4d0 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -237,6 +237,9 @@ and other scripts to koha/
 	  if (-f $src) {
 		if ($src =~ /(misc|updater|rss)\//) {
 			$result{$src} = '$(INST_BIN)/koha/'.$src;
+		}
+		elsif ($src =~ /opac\//){
+		    $result{$src} = '$(INST_BIN)/cgi-bin/'.$src;
 		} else {
 			$result{$src} = '$(INST_BIN)/cgi-bin/koha/'.$src;
 		}
diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 077a76ee63..24d147c7eb 100644
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -37,9 +37,9 @@
    DocumentRoot __BASE_DIR__/templates/koha-tmpl/
    ServerName __WEBSERVER_HOST__:__WEBSERVER_PORT_LIBRARIAN__
 #  ServerAlias intranet.mydomain.com
-   ScriptAlias /cgi-bin/koha/ "__CGI_DIR__/"
-   ScriptAlias /index.html "__CGI_DIR__/mainpage.pl"
-   ScriptAlias /search "__CGI_DIR__/search.pl"
+   ScriptAlias /cgi-bin/koha/ "__CGI_DIR__/koha/"
+   ScriptAlias /index.html "__CGI_DIR__/koha/mainpage.pl"
+   ScriptAlias /search "__CGI_DIR__/koha/search.pl"
    ErrorLog __LOG_DIR__/koha-error_log
 #  TransferLog __LOG_DIR__/koha-access_log
    SetEnv KOHA_CONF "__PREFIX__/share/koha/etc/koha-conf.xml"
diff --git a/rewrite-config.PL b/rewrite-config.PL
index 558f54435d..a824e6727b 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -72,7 +72,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
 # <grep -o '__.*__' etc/* | cut -f2 -d: | sort -u | sed -e 's/^/  "/;s/$/" => "",/'
 %configuration = (
   "__BASE_DIR__" => ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
-  "__CGI_DIR__" => $prefix."/lib/cgi-bin/koha",
+  "__CGI_DIR__" => $prefix."/lib/cgi-bin",
   "__LOG_DIR__" => "/var/log",
   "__DB_TYPE__" => "mysql",
   "__DB_NAME__" => "koha",
-- 
2.20.1