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

[Petr Mladek]

 solenv/bin/ooinstall |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9dd2241c60635ba15929ffad9962928460bd3ec
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue May 3 14:27:06 2011 +0200

    ooinstall: respect DESTDIR
    
    The problem was that ooinstall just passed -destdir to
    make_installer.pl, but before that, it tried to create the root
    directory, where it did not respect DESTDIR.
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 83717fa..47c06cb 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -29,7 +29,7 @@ for $arg (@ARGV) {
 	$help = 1;
     } else {
 	# Cwd::realpath does not work if the path does not exist
-	mkpath($arg) unless -d $arg;
+	mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
 	$path = Cwd::realpath( $arg );
     }
 }