diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-01-21 15:51:56 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-01-21 16:03:21 +0100 |
| commit | 148739e8bd2b5076d4cc851539ba7266d6b7075c (patch) | |
| tree | 879f9ba8d4c044d9b37a2af5b7c68be0cf923d4b /solenv/bin | |
| parent | 52e721c1010451837ea3ac40c019bf914ee51f89 (diff) | |
make ooenv work even when not invoked when in its directory
Diffstat (limited to 'solenv/bin')
| -rwxr-xr-x | solenv/bin/linkoo | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 8a291883a94f..297a736dfb75 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -40,12 +40,12 @@ use strict; # ends up in program/ooenv ( my $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/; my $env_script = ' -java_path=`../basis-link/ure-link/bin/javaldx 2>/dev/null` -export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH" +java_path=`$thisdir/../basis-link/ure-link/bin/javaldx 2>/dev/null` +export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH" ulimit -c unlimited -export PATH=".:../basis-link/program:../basis-link/ure-link/bin:$PATH" +export PATH="$thisdir/:$thisdir/../basis-link/program:$thisdir/../basis-link/ure-link/bin:$PATH" export GNOME_DISABLE_CRASH_DIALOG=1 -export STAR_RESOURCEPATH=`pwd`/../basis-link/program/resource +export STAR_RESOURCEPATH=$thisdir/../basis-link/program/resource # debugging assistance export G_SLICE=always-malloc export MALLOC_CHECK_=2 @@ -384,6 +384,7 @@ if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") { my $ooenv; print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n"; open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!"; + print $ooenv "thisdir=$OOO_INSTALL/" . $brand_program_dir . "/\n"; print $ooenv $env_script; print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n"; close ($ooenv); |