Index: bootstrap.1
===================================================================
RCS file: /cvs/tools/config_office/bootstrap.1,v
retrieving revision 1.16
retrieving revision 1.16.10.2
diff -u -r1.16 -r1.16.10.2
--- bootstrap.1	5 Jul 2006 22:07:20 -0000	1.16
+++ bootstrap.1	12 Jul 2006 21:27:35 -0000	1.16.10.2
@@ -1,29 +1,32 @@
 
 # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
 if test "$GUI" = "WNT"; then
-  export EXEEXT=".exe"
+  EXEEXT=".exe"
 else
-  export EXEEXT=""
+  EXEEXT=""
 fi
+export EXEEXT
 
 if test "$BUILD_DMAKE" != "NO"; then
 
-  if test ! -e "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+  if test ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
 
   cd "$SRC_ROOT/dmake" || exit
 
   # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
   # but we need a cygwin/gcc build dmake to understand the posix paths
   if test "$GUI" = "WNT" -a "$USE_SHELL" != "4nt"; then
-    export CC=""
-    export CXX=""
+    CC=""
+    CXX=""
+    export CC
+    export CXX
   fi
 
   # For the W32/4nt case
   rm -rf objects
 
   # For normal unixy systems
-  if test -e "Makefile" ; then
+  if test -f "Makefile" ; then
     $GNUMAKE distclean || exit
   fi
 
@@ -45,8 +48,6 @@
   fi
 
 fi
-
-# unalias these commands if they are aliased
 
 mkdir -p "$SOLARENV/$OUTPATH/bin"
 if test "$BUILD_DMAKE" != "NO"; then
Index: bootstrap.2
===================================================================
RCS file: bootstrap.2
diff -N bootstrap.2
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
retrieving revision 1.107.4.3
diff -u -r1.107 -r1.107.4.3
--- set_soenv.in	5 Jul 2006 22:32:39 -0000	1.107
+++ set_soenv.in	12 Jul 2006 12:50:29 -0000	1.107.4.3
@@ -1826,10 +1826,14 @@
     ToFile( "PYTHONHOME",        $PYTHONHOME,        "e" );
   }
 }
+
 #
 # Writing the aliases to file.
-# (c = comment, e = environment variable, a = alias )
 ToFile( "Aliases.",          $empty,             "c" );
+ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
+ToFile( 'if ( ! ${?_ISBOOTSTRAP_} ) then', $empty, "y");
+ToFile( "if test -z \"\$_ISBOOTSTRAP_\"; then", $empty, "z");
+
 ToFile( "alias mkout",       $mkout,             "a" );
 ToFile( "alias deliver",     $deliver,           "a" );
 ToFile( "alias build",       $build,             "a" );
@@ -1837,9 +1841,11 @@
 if ( $platform !~ m/cygwin/ )
 {  ToFile( "alias nmake",       $nmake,             "a" );
 }
-# write make command for dmake for windows
-# (x = write as is)
 
+ToFile( "endif",             $empty, "y");
+ToFile( "fi",                $empty, "z");
+
+# write make command for dmake for W32-4nt
 if ( $platform =~ m/cygwin/ and '@USE_SHELL@' eq "4nt" )
 {
   ToFile( "build the dmake executable.", $empty, "c");
@@ -1965,7 +1971,7 @@
 open( OUT, ">$bootfile" ) ||
 die "Cannot open $bootfile: $!\n";
 print OUT "#!/bin/sh\n";
-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n"; 
+print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile.sh\n"; 
 close( OUT ) || print "Can't close $bootfile: $!";
 system(`cat bootstrap.1 >> bootstrap`);
 system(`chmod +x bootstrap`);
@@ -2070,7 +2076,8 @@
 #                   n - newline
 #                   j - env. var in DOS style (WINNT only)
 #                   x - raw, write as is to OUT_BAT
-#                   y - raw, write as is to OUT and OUT_SH
+#                   y - raw, write as is to OUT
+#                   z - raw, write as is to OUT_SH
 # Return value:  void
 #---------------------------------------------------------
 sub ToFile {
@@ -2160,6 +2167,10 @@
    {
       #Write first argument as is, and nothing else
       print OUT "$_[ 0 ]$newline";
+   }
+   elsif ( $_[ 2 ] eq "z" )
+   {
+      #Write first argument as is, and nothing else
       print OUT_SH "$_[ 0 ]$newline";
    }
    elsif ( $_[ 2 ] eq "j" ) {