diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-20 11:11:49 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-20 11:11:49 +0100 |
commit | 73da209a2775583ece3218893fd5659c1290cd70 (patch) | |
tree | c8ed663f8256774d5b4b7b1406163d1e7118f89d /solenv/bin | |
parent | f241f91e03c25d337598092b21f1c1360c7731eb (diff) |
Do not remove the destdir prefix in any case
708def7d94bb76ef137572a364d2643402dc590b made that code conditional on !$do_link
so that it worked right for the case where making dev-install calls ooinstall
-l. However, that code now starts to fail also in the --disable-linkoo case
(where building dev-install calls ooinstall w/o -l). I have no idea whether
that code serves any real purpose in any actual use case, so remove it
completely for now.
Diffstat (limited to 'solenv/bin')
-rwxr-xr-x | solenv/bin/ooinstall | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 794e81b930df..b7a5d941886a 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -48,10 +48,6 @@ for $arg (@ARGV) { # Cwd::realpath does not work if the path does not exist mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg; $path = Cwd::realpath( $ENV{DESTDIR} . $arg ); - if (!$do_link) { - my $destdir = Cwd::realpath( $ENV{DESTDIR} ); - $path =~ s|$destdir||; - } } } |