[ooo-build-commit] bin/unpack

[Tor Lillqvist]

 bin/unpack |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit d73155c1d58e47efbf23cf52e5edb34062c98663
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 5 13:39:34 2009 +0300

    Don't pointlessly try to run ant on Windows

diff --git a/bin/unpack b/bin/unpack
index 809195a..64edda2 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -590,14 +590,16 @@ fi
 
 APACHE_ANT='apache-ant-1.7.0'
 APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
-ANT_VERSION=`ant -version | awk '{ print $4 }'`
 
 if test "z$BUILD_WIN32" != "z"; then
 	check_file $SRCDIR/$APACHE_ANT_TARBALL
-elif test -x /usr/bin/ant && \
-	test "`echo $ANT_VERSION | cut -d. -f1`" = "1" \
-          -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" ]; then
-	check_file $SRCDIR/$APACHE_ANT_TARBALL
+else
+	ANT_VERSION=`ant -version | awk '{ print $4 }'`
+	if test -x /usr/bin/ant && \
+	   test "`echo $ANT_VERSION | cut -d. -f1`" = "1" \
+                -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" ]; then
+		check_file $SRCDIR/$APACHE_ANT_TARBALL
+	fi
 fi
 
 if test -f $SRCDIR/$APACHE_ANT_TARBALL; then