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

[René Engelhard]

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

New commits:
commit 2429190ef54865b4f37c86103780d6b4d21e75d7
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 2 02:28:15 2010 +0100

    export OOO_LANGS_LIST,OODESTDIR and OOO_STRIP for solenv/bin/ooinstall

diff --git a/bin/ooinstall b/bin/ooinstall
index b5d29ab..a8113ce 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -69,7 +69,8 @@ if ($help) {
 $sources_path=Cwd::realpath($setup_vars{'OOBUILDDIR'});
 
 # Call the solenv/bin/ooinstall
-system ("cd $sources_path ; . ./*Set.sh ; solenv/bin/ooinstall $linked $path") && die "Failed to ooinstall";
+# Note we need to export those here, as solenv/bin/ooinstall can't use $setup_vars and needs to get them from $ENV
+system ("cd $sources_path ; . ./*Set.sh ; export OOO_LANGS_LIST=$setup_vars{'OOO_LANGS_LIST'}; export OODESTDIR=$setup_vars{'OODESTDIR'}; export OOO_STRIP=$setup_vars{'OOO_STRIP'}; solenv/bin/ooinstall $linked $path") && die "Failed to ooinstall";
 
 print "Installing extra dictionaries...\n";
 system ("cd $setup_vars{TOOLSDIR}/bin ; " .