[Libreoffice-commits] .: bootstrap.1

[Michael Meeks]

 bootstrap.1 |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 2786f2110a7352302f789584948b7ab959f16436
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 1 20:58:53 2010 +0000

    overcome aborted download problems
    
    Previously if we aborted the download, it would delete dmake/dmake
    which would then simply not be re-built, since we were checking for
    the version in the solver in the bootstrap script - which would still
    be there.

diff --git a/bootstrap.1 b/bootstrap.1
index 304f41c..fa5e501 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -14,9 +14,7 @@ export EXEEXT
 # Build dmake
 
 if test "$BUILD_DMAKE" != "NO"; then
-
-    if test ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
-
+    if test ! -x "$SRC_ROOT/dmake/dmake"; then
         cd "$SRC_ROOT/dmake" || exit
 
         # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
@@ -42,14 +40,9 @@ if test "$BUILD_DMAKE" != "NO"; then
         echo "dmake has been successfully built"
 
         cd ..
-
     else
-
-        echo ""
-        echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
-
+	echo "dmake/dmake already built"
     fi
-
 fi
 
 mkdir -p "$SOLARENV/$OUTPATH/bin"