[Libreoffice] [PATCH] ooinstall: respect DESTDIR

[Miklos Vajna]

On Sun, Apr 24, 2011 at 01:51:47PM +0200, Andreas Radke <a.radke at arcor.de> wrote:
> DESTDIR seem to be not properly applied to ooinstall. Has anybody
> tested this? It doens't work for me.

I had the same problem, the attached patch seems to fix it here.

Petr, could you please review and in case it looks ok, then sign off /
push it to -3-4?

Thanks.
-------------- next part --------------
From 0cabc8890365201cd8ad5764473c5fe50e0f06f5 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Tue, 3 May 2011 14:27:06 +0200
Subject: [PATCH] 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.
---
 solenv/bin/ooinstall |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 7ab12b9..b3f4c5f 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 );
     }
 }
-- 
1.7.4.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20110503/f6bd678e/attachment.pgp>