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

[Petr Mladek]

 solenv/bin/ooinstall |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 17adf76bb37afc368a674adfd8e9e2b61faf6e93
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 3 15:14:26 2011 +0200

    ooinstall: use DESTDIR also for the Cwd::realpath call
    
    this solution is not perfect because Cwd::realpath($ENV{DESTDIR})
    need not be part of Cwd::realpath($ENV{DESTDIR} . $arg). Let's
    solve this when it really cause troubles.

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 47c06cb..4afdb23 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -30,7 +30,9 @@ for $arg (@ARGV) {
     } else {
 	# Cwd::realpath does not work if the path does not exist
 	mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
-	$path = Cwd::realpath( $arg );
+	$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
+	my $destdir = Cwd::realpath( $ENV{DESTDIR} );
+	$path =~ s|$destdir||;
     }
 }