[Bio] / FigCommon / bootstrap.pl Repository:
ViewVC logotype

Diff of /FigCommon/bootstrap.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11, Thu Jun 3 18:25:21 2004 UTC revision 1.13, Thu Jun 3 19:45:57 2004 UTC
# Line 196  Line 196 
196    
197      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);
198    
199      push(@$Env, ["PERL5LIB", join(":", grep({ $_ ne "." } @INC)), 1]);      my @perllib = grep({ $_ ne "." } @INC, "$fig_disk/config", $release_lib);
200    
201        push(@$Env, ["PERL5LIB", join(":", @perllib), 1]);
202  }  }
203    
204  sub configure_python  sub configure_python
# Line 284  Line 286 
286      $python = "$ENV{FIGCONFIG_ENV_DIR}/bin/python";      $python = "$ENV{FIGCONFIG_ENV_DIR}/bin/python";
287      if (-x $python)      if (-x $python)
288      {      {
289            #
290            # The mac doesn't seem to like the long #! lines, so we'll use poundbang env.
291            #
292            if ($ENV{FIGCONFIG_ENV} eq "mac")
293            {
294                $OtherConfig->{python_require_poundbang_env} = 1;
295            }
296          return $python;          return $python;
297      }      }
298    
# Line 574  Line 583 
583      # Append the perl path to the environment, for use later with CallPerl.      # Append the perl path to the environment, for use later with CallPerl.
584      #      #
585    
586      my $perlpath = join(":", @INC, "$fig_disk/config");      my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib);
587      print $fh <<END;      print $fh <<END;
588  if os.getenv("PERL5LIB", "") != "":  if os.getenv("PERL5LIB", "") != "":
589      _delim = ":"      _delim = ":"

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.13

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3