[Libreoffice-commits] .: solenv/bin

[Stephan Bergmann]

 solenv/bin/ooinstall |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 73da209a2775583ece3218893fd5659c1290cd70
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 20 11:11:49 2012 +0100

    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.

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 794e81b..b7a5d94 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||;
-	    }
     }
 }