Index: llvmCore/utils/buildit/GNUmakefile
===================================================================
--- llvmCore/utils/buildit/GNUmakefile	(revision 83314)
+++ llvmCore/utils/buildit/GNUmakefile	(working copy)
@@ -59,7 +59,7 @@
 # NOTE : Always put version numbers at the end because they are optional.
 install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	cd $(OBJROOT) && \
-	  $(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
+	  $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
 	    $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
Index: llvmCore/utils/buildit/build_llvm
===================================================================
--- llvmCore/utils/buildit/build_llvm	(revision 83314)
+++ llvmCore/utils/buildit/build_llvm	(working copy)
@@ -85,6 +85,8 @@
 rm -rf $SRC_DIR || exit 1
 mkdir $SRC_DIR || exit 1
 ln -s $ORIG_SRC_DIR/* $SRC_DIR/ || exit 1
+# Replace the top-level 'Makefile' with the genuine 'Makefile.standard':
+ln -sf $ORIG_SRC_DIR/Makefile.standard $SRC_DIR/Makefile || exit 1
 
 # Build the LLVM tree universal.
 mkdir -p $DIR/obj-llvm || exit 1
Index: llvmCore/autoconf/configure.ac
===================================================================
--- llvmCore/autoconf/configure.ac	(revision 83314)
+++ llvmCore/autoconf/configure.ac	(working copy)
@@ -1337,6 +1337,7 @@
 AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])
 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(Makefile.common)
+AC_CONFIG_MAKEFILE(Makefile.standard)
 AC_CONFIG_MAKEFILE(examples/Makefile)
 AC_CONFIG_MAKEFILE(lib/Makefile)
 AC_CONFIG_MAKEFILE(runtime/Makefile)