summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-05-05 07:50:18 +0200
committerThorsten Behrens <tbehrens@novell.com>2011-05-05 07:50:18 +0200
commit55627a48b1753f584e78e975af4d3b5d13d0db39 (patch)
tree10731be6dca1c228b520de5d9e0a152d8acc57e2
parentb66d73dec37f748917627ce525f428825b7d9089 (diff)
Fix ooinstall -l case
Removing destdir prefix for dev-install case is not a good idea
-rwxr-xr-xsolenv/bin/ooinstall12
1 files changed, 7 insertions, 5 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 4afdb23d0..89aea81a6 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||;
+ }
}
}