Changeset 28575 for main/trunk/greenstone2/perllib/util.pm
- Timestamp:
- 2013-10-31T20:21:30+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/util.pm
r28560 r28575 1656 1656 # Though this is only needed for darwin Lion at this point (and android, though that is untested) 1657 1657 1658 my $env_vars="";1659 1660 1658 my $libext = "so"; 1661 1659 if ($ENV{'GSDLOS'} =~ m/^windows$/i) { 1662 #return $env_vars;1663 1660 return; 1664 1661 } elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) { … … 1689 1686 if(-d $gnomelib_bin) { # no bin subfolder in GS binary's cutdown gnome-lib-minimal folder 1690 1687 &util::envvar_prepend("PATH", $gnomelib_bin); 1691 #$env_vars = "export PATH=".$ENV{'PATH'}.";";1692 1688 } 1693 1689 … … 1697 1693 if($ENV{'GSDLOS'} eq "linux") { 1698 1694 &util::envvar_prepend("LD_LIBRARY_PATH", $gextlib); 1699 #$env_vars .= "export LD_LIBRARY_PATH=".$ENV{'LD_LIBRARY_PATH'};1700 1695 } 1701 1696 elsif ($ENV{'GSDLOS'} eq "darwin") { 1702 1697 #&util::envvar_prepend("DYLD_LIBRARY_PATH", $gextlib); 1703 1698 &util::envvar_prepend("DYLD_FALLBACK_LIBRARY_PATH", $gextlib); 1704 #$env_vars .= "export DYLD_FALLBACK_LIBRARY_PATH=".$ENV{'DYLD_FALLBACK_LIBRARY_PATH'};1705 1699 } 1706 1700 } … … 1718 1712 # if no GEXTGNOME, maybe users didn't need gnome-lib to run gnomelib/libiconv dependent binaries like hashfile, suffix, wget 1719 1713 # (wvware is launched in a gnomelib env from its own script, but could possibly go through this script in future) 1720 1721 #return $env_vars; #print STDOUT $env_vars;1722 1714 } 1723 1715
Note:
See TracChangeset
for help on using the changeset viewer.