X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=66f9a0f064566afc31d09fa0c8ec1652c0fce615;hb=37d5da91cdb91feb88bebb5dd669e2074a22b857;hp=f306e2d866b8a543753723a23773f5c5b121d831;hpb=07ba06a5af4ec9bfea63769bf6162f0f8aec0a94;p=koha_fer

diff --git a/Makefile.PL b/Makefile.PL
index f306e2d866..66f9a0f064 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -265,6 +265,8 @@ my $target_map = {
   './changelanguage.pl'         => 'INTRANET_CGI_DIR',
   './check_sysprefs.pl'         => 'NONE',
   './circ'                      => 'INTRANET_CGI_DIR',
+  './course_reserves'           => 'INTRANET_CGI_DIR',
+  './docs/history.txt'          => { target => 'DOC_DIR', trimdir => -1 },
   './offline_circ'		=> 'INTRANET_CGI_DIR',
   './edithelp.pl'               => 'INTRANET_CGI_DIR',
   './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
@@ -293,6 +295,7 @@ my $target_map = {
   './OpenILS'                   => 'PERL_MODULE_DIR',
   './README.txt'                => 'NONE',
   './patroncards'               => 'INTRANET_CGI_DIR',
+  './patron_lists'              => 'INTRANET_CGI_DIR',
   './plugins'                   => 'INTRANET_CGI_DIR',
   './reports'                   => 'INTRANET_CGI_DIR',
   './reserve'                   => 'INTRANET_CGI_DIR',
@@ -476,7 +479,7 @@ my %valid_config_values = (
   'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
   'BIB_INDEX_MODE'  => { 'grs1' => 1, 'dom' => 1 },
   'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
-  'ZEBRA_LANGUAGE'    => { 'en' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution
+  'ZEBRA_LANGUAGE'    => { 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution
   'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
   'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
   'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
@@ -1600,29 +1603,6 @@ sub postamble {
 		$env .= join("\n", map { "export __${_}__ := $config{$_}" } keys %config);
 	}
 
-    if ( $config{'RUN_DATABASE_TESTS'} eq 'yes' ) {
-        if ( open( my $confhandle, '>', 't/test-config.txt' ) ) {
-            print $confhandle "# This configuration file lets the t/Makefile prepare a test koha-conf.xml file.\n";
-            print $confhandle "# It is generated by the top-level Makefile.PL.\n";
-            print $confhandle "# It is separate from the standard koha-conf.xml so that you can edit this by hand and test with different configurations.\n";
-
-            # these directories will be relocated to the 't' directory
-            foreach my $dirname ( keys %$target_directories ) {
-                my $dir = main::_strip_destdir( $target_directories->{$dirname} );
-                if ( exists $test_suite_override_dirs{$dirname} ) {
-                    $dir = main::get_test_dir($dirname);
-                }
-                print $confhandle "$dirname = $dir\n"
-            }
-            print $confhandle "\n";
-
-            print $confhandle join( "\n", map { "$_ = $config{$_}" } keys( %config ) ), "\n";
-            close( $confhandle );
-        } else {
-            warn 'unable to open conf file for database dependent tests: $!';
-        }
-
-    }
     return "$env\n";
 }