[ooo-build-commit] bin/unpack download.in

[Jan Holesovsky]

 bin/unpack  |    2 +-
 download.in |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit c3c2c85b7b3e9700f1de16421676638a5d68c600
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jun 1 15:36:24 2009 +0200

    Fix downloading of the translations when configuring with --with-git.
    
    * bin/unpack: Unpack that in case of Win32.
    * download.in: Fix the condition.

diff --git a/bin/unpack b/bin/unpack
index 0656bf4..2661c19 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -94,7 +94,7 @@ else
     else
         CORE_PKGS=$ALL_CORE_PKGS
     fi
-    if test "z$OOO_LANGS" != "zen-US"; then
+    if test "z$OOO_LANGS" != "zen-US" -o "z$BUILD_WIN32" != "z"; then
         CORE_PKGS="$CORE_PKGS l10n"
     fi
     for pkg in $CORE_PKGS ; do
diff --git a/download.in b/download.in
index a98701b..b2bdfe7 100755
--- a/download.in
+++ b/download.in
@@ -347,8 +347,10 @@ if ('@USE_PREBUILD_UNOWINREG_DLL@' eq 'YES') {
     push @files, ( "unowinreg.dll" );
 }
 
-if (!$SPLIT && ($download_all || '@OOO_LANGS@' ne 'en-US' || '@BUILD_WIN32@' ne '' )) {
-    source_file( "l10n" );
+if ( $download_all || '@OOO_LANGS@' ne 'en-US' || '@BUILD_WIN32@' ne '' ) {
+    if ( !$SPLIT || ( '@OOO_GIT@' ne "" ) ) {
+        source_file( "l10n" );
+    }
 }
 
 if ('@PIECE@' eq 'bootstrap') {