Changeset 21804 for main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

Timestamp:

2010-03-19T22:20:20+13:00 (14 years ago)

Author:

ak19

Message:

Dr Bainbridge modified the section setting Perl to bring it in line with what setup.bash does when Perl 5.8.9 has been downloaded and extracted into the bin linux folder. Need perlpath property in gsdlsite.cfg set, for the Remote Greenstone to do the same, though.

File:

• main/trunk/greenstone2/cgi-bin/gsdlCGI.pm (modified) (1 diff)

main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

@@ -454 +454 @@
     # prepended to PATH only if the same perl bin dir path is not already on PATH env
     my $perl_bin_dir = $self->get_perl_path($optional);
-    if(defined $perl_bin_dir) 
+    if(defined $perl_bin_dir)
     {
-    &util::envvar_prepend("PATH", $perl_bin_dir);   
+    &util::envvar_prepend("PATH", $perl_bin_dir);
+
+    #my ($perl_home) = ($perl_bin_dir =~ m/(.*)[\\|\/]bin[\\|\/]?$/);
+    my ($tailname,$perl_home) = File::Basename::fileparse($perl_bin_dir, "\\.(?:[^\\.]+?)\$");
+    $ENV{'PERL5LIB'} = &util::filename_cat($perl_home, "lib");
+
+    if($gsdlos eq "darwin") {
+        &util::envvar_prepend("DYLD_LIBRARY_PATH", &util::filename_cat($perl_home,"5.8.9","darwin-thread-multi-2level","CORE"));
+    } elsif($gsdlos eq "linux") {
+        &util::envvar_prepend("LD_LIBRARY_PATH", &util::filename_cat($perl_home,"5.8.9","i686-linux-thread-multi","CORE"));
+    }
     }
     elsif ($gsdlos eq "windows")