diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-05-02 19:39:41 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-05-02 19:51:38 +0200 |
commit | f33ba93baddca139ab900b79cfeffd69e318aa6b (patch) | |
tree | 161139b68e0b5aadff375c097ece66642cf25a2f /solenv | |
parent | bd5da80befbd1f7f09aadf4b02122414c010d65b (diff) |
allow custom solver/workdir location: --with-solver-and-workdir-root
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/linkoo | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index f825e3083762..ae9794409005 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -325,7 +325,7 @@ sub scan_and_link_files($$$) } # Now scan the solver - scan_one_dir ($installed_files, \%build_files, "$build_path/solver/$target", 1); + scan_one_dir ($installed_files, \%build_files, "$ENV{'SOLARVER'}/$target", 1); for my $file (keys %build_files) { my $src = $build_files{$file}; @@ -389,7 +389,7 @@ sub link_gdb_py() my $dirh; my @basis; my @ure; - my $src = "$OOO_BUILD/solver/$TARGET/lib"; + my $src = "$ENV{'SOLARVER'}/$TARGET/lib"; opendir ($dirh, $src) || die "can't open solver: $src: $!"; while (my $dent = readdir ($dirh)) { $dent =~ /^\./ && next; @@ -419,7 +419,7 @@ sub link_pagein_files() return if ($windows); print "pagein case:"; - my $src = "$OOO_BUILD/solver/$TARGET/bin"; + my $src = "$ENV{'SOLARVER'}/$TARGET/bin"; my $dest = "$OOO_INSTALL/" . $brand_program_dir; for my $c ('calc', 'draw', 'impress', 'writer', 'common') { do_link ($src, $dest, "pagein-$c", "pagein-$c"); |