[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/bin

[Thorsten Behrens]

 solenv/bin/ooinstall |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 55627a48b1753f584e78e975af4d3b5d13d0db39
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu May 5 07:50:18 2011 +0200

    Fix ooinstall -l case
    
    Removing destdir prefix for dev-install case is not a good idea

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 4afdb23..89aea81 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||;
+	    }
     }
 }