diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-05-05 07:50:18 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-05-05 07:50:18 +0200 |
commit | 708def7d94bb76ef137572a364d2643402dc590b (patch) | |
tree | 049faf86db69632cfd84bdcc82bcee6b41535517 /solenv/bin/ooinstall | |
parent | ca718e36f189fd6ac941491757fec3f06e897c7a (diff) |
Fix ooinstall -l case
Removing destdir prefix for dev-install case is not a good idea
Diffstat (limited to 'solenv/bin/ooinstall')
-rwxr-xr-x | solenv/bin/ooinstall | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 4afdb23d0133..89aea81a6741 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -28,11 +28,13 @@ for $arg (@ARGV) { } elsif ($arg eq '-h' || $arg eq '--help') { $help = 1; } else { - # 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 ); - my $destdir = Cwd::realpath( $ENV{DESTDIR} ); - $path =~ s|$destdir||; + # 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||; + } } } |