X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=c88d5ea106efd90e2743ce28fe05d974095c43f8;hb=32f058aaee6fafc787527bed925b11d4ac6653f6;hp=a7cd3cf98cf4583773edabbe8605cbb63fcea8b1;hpb=8e0b1fe58f7e4f6e595b18d43c939c203833dac1;p=koha_gimpoz

diff --git a/Makefile.PL b/Makefile.PL
index a7cd3cf98c..c88d5ea106 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -11,9 +11,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Current maintainer MJR http://mjr.towers.org.uk/
 # See http://www.koha.org/wiki/?page=KohaInstaller
@@ -241,6 +241,7 @@ my $target_map = {
   './acqui'                     => 'INTRANET_CGI_DIR',
   './admin'                     => 'INTRANET_CGI_DIR',
   './authorities'               => 'INTRANET_CGI_DIR',
+  './basket'                    => 'INTRANET_CGI_DIR',
   './C4'                        => 'PERL_MODULE_DIR',
   './C4/SIP/t'                  => 'NONE',
   './C4/SIP/koha_test'          => 'NONE',
@@ -275,6 +276,7 @@ my $target_map = {
   './misc/installer_devel_notes' => 'NONE',
   './opac'                      => 'OPAC_CGI_DIR',
   './README.txt'                => 'NONE',
+  './patroncards'               => 'INTRANET_CGI_DIR',
   './reports'                   => 'INTRANET_CGI_DIR',
   './reserve'                   => 'INTRANET_CGI_DIR',
   './reviews'                   => 'INTRANET_CGI_DIR',
@@ -397,7 +399,7 @@ my %config_defaults = (
   'INSTALL_ZEBRA'     => 'yes',
   'INSTALL_SRU'       => 'yes',
   'INSTALL_PAZPAR2'   => 'no',
-  'AUTH_INDEX_MODE'   => 'grs1',
+  'AUTH_INDEX_MODE'   => 'dom',
   'ZEBRA_MARC_FORMAT' => 'marc21',
   'ZEBRA_LANGUAGE'    => 'en',
   'ZEBRA_USER'        => 'kohauser',
@@ -537,6 +539,7 @@ WriteMakefile(
               NO_META      => 1,
               PREREQ_PM => {
                             'Algorithm::CheckDigits'           => 0.50,
+							'Authen::CAS::Client'              => 0.05,
                             'Biblio::EndnoteStyle'             => 0.05,
                             'CGI'                              => 3.15,
                             'CGI::Carp'                        => 1.29,
@@ -574,7 +577,9 @@ WriteMakefile(
 			    'Lingua::Stem::Snowball'	       => 0.952,
                             'List::Util'                       => 1.18,
                             'List::MoreUtils'                  => 0.21,
+                            'Locale::Currency::Format'         => 1.28,
                             'Locale::Language'                 => 2.07,
+                            'Locale::PO'                       => 0.17,
                             'MARC::Charset'                    => 0.98,
                             'MARC::Crosswalk::DublinCore'      => 0.02,
                             'MARC::File::XML'                  => 0.88,
@@ -598,7 +603,7 @@ WriteMakefile(
                             'POE'                              => 0.9999,
                             'POSIX'                            => 1.09,
                             'Schedule::At'                     => 1.06,
-                            'Storable'	                       => 2.21,
+                            'Storable'	                       => 2.20,
                             'SMS::Send'                        => 0.05, # optional
                             'Term::ANSIColor'                  => 1.10,
                             'Test'                             => 1.25,
@@ -606,6 +611,7 @@ WriteMakefile(
                             'Test::More'                       => 0.80,
                             'Text::CSV'                        => 0.01,
                             'Text::CSV_XS'                     => 0.32,
+                            'Text::CSV::Encoded'               => 0.09,
                             'Text::Iconv'                      => 1.7,
                             'Text::Wrap'                       => 2005.082401,
                             'Time::HiRes'                      => 1.86,
@@ -1189,6 +1195,7 @@ sub _get_value {
 
     # take value from install log if present
     if (exists $install_log_values{$key}) {
+        $install_log_values{$key} =~ s/\$/\$\$/g;
         return $install_log_values{$key};
     }
 
@@ -1208,6 +1215,7 @@ sub _get_value {
         $retry_msg .= _add_valid_values_disp($key, $valid_values);
         $val = prompt($retry_msg, $default);
     }
+    $val =~ s/\$/\$\$/g;
     return $val;
 }
 
@@ -1599,13 +1607,6 @@ sub postamble {
     # variables -- this is for the use of
     # rewrite-confg.PL
 
-    # quote '$' in the two password parameters
-    my %config = %config;
-    $config{'DB_PASS'} =~ s/\$/\$\$/g;
-    if ($config{'INSTALL_ZEBRA'} eq "yes") {
-        $config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
-    }
-
     my $env;
 	# Hereagain, we must alter syntax per platform...
 	if ( $^O eq 'MSWin32' ) {