Index: autoconf/configure.ac
===================================================================
--- autoconf/configure.ac
+++ autoconf/configure.ac
@@ -105,7 +105,7 @@
 ],
 [
   AC_MSG_RESULT([no])
-  AC_MSG_ERROR([Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler ./configure ...])
+  AC_MSG_ERROR([Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler SRC_ROOT/configure ...])
 ])
   AC_LANG_POP([C++])
 fi
Index: configure
===================================================================
--- configure
+++ configure
@@ -3605,8 +3605,8 @@
 
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler ./configure ..." >&5
-echo "$as_me: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler ./configure ..." >&2;}
+  { { echo "$as_me:$LINENO: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler SRC_ROOT/configure ..." >&5
+echo "$as_me: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler SRC_ROOT/configure ..." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
Index: docs/BuildingLLVMWithAutotools.rst
===================================================================
--- docs/BuildingLLVMWithAutotools.rst
+++ docs/BuildingLLVMWithAutotools.rst
@@ -187,7 +187,7 @@
 ``gmake install``
 
   Installs LLVM header files, libraries, tools, and documentation in a hierarchy
-  under ``$PREFIX``, specified with ``./configure --prefix=[dir]``, which
+  under ``$PREFIX``, specified with ``SRC_ROOT/configure --prefix=[dir]``, which
   defaults to ``/usr/local``.
 
 ``gmake -C runtime install-bytecode``
Index: docs/FAQ.rst
===================================================================
--- docs/FAQ.rst
+++ docs/FAQ.rst
@@ -102,7 +102,7 @@
 
 .. code-block:: console
 
-   % PATH=[the path without the bad program] ./configure ...
+   % PATH=[the path without the bad program] SRC_ROOT/configure ...
 
 This is still somewhat inconvenient, but it allows ``configure`` to do its
 work without having to adjust your ``PATH`` permanently.
Index: docs/HowToBuildOnARM.rst
===================================================================
--- docs/HowToBuildOnARM.rst
+++ docs/HowToBuildOnARM.rst
@@ -40,7 +40,7 @@
 
    .. code-block:: bash
 
-     ./configure --build=armv7l-unknown-linux-gnueabihf \
+     ../$LLVM_SRC_DIR/configure --build=armv7l-unknown-linux-gnueabihf \
      --host=armv7l-unknown-linux-gnueabihf \
      --target=armv7l-unknown-linux-gnueabihf --with-cpu=cortex-a9 \
      --with-float=hard --with-abi=aapcs-vfp --with-fpu=neon \