Merged r9559 (a manual fix) from the trunk.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_4_BRANCH@9560

diff --git a/README b/README
index 3a75cd7eb1592d3ba12f306e2231cb8cb7cedde8..38c570e7e3d903032bcb46f6426597d461f7beda 100644 (file)
--- a/README
+++ b/README
@@ -87,7 +87,7 @@ To install from a tar.bz2 distribution:
      options are documented in the INSTALL file.  The only interesting
      one is the usual --prefix=/where/you/want/it/installed.
 
-  5. Do "make".
+  5. Do "make".  (Nb: this cannot be combined with the next step.)
 
   6. Do "make install", possibly as root if the destination permissions
      require that.

diff --git a/docs/xml/manual-writing-tools.xml b/docs/xml/manual-writing-tools.xml
index a78254cccb3c677c3145a9f332aaa53cb9c19a00..7b0e2bfdeb7d736350fe55ee5f1b936ace42c40e 100644 (file)
--- a/docs/xml/manual-writing-tools.xml
+++ b/docs/xml/manual-writing-tools.xml
@@ -140,6 +140,7 @@ top-level directory <computeroutput>valgrind/</computeroutput>.</para>
 <programlisting><![CDATA[
   autogen.sh
   ./configure --prefix=`pwd`/inst
+  make          # Nb: this cannot be combined with the next step
   make install]]></programlisting>
 
    <para>It should automake, configure and compile without errors,