Update build instructions

linux/build.txt

@@ -1,13 +1,10 @@
 Instructions for Building on Linux
 
-Fuller instructions that cover:
+Fuller instructions can be found on our wiki at http://wiki.audacityteam.org/wiki/Building_On_Linux.
-    * Upgrading to gcc 4.9 on older Ubuntus
+
-    * Optional libraries
+In fact you should read those instructions rather than these 
-can be found on our wiki at http://wiki.audacityteam.org/wiki/Building_On_Linux.
+once.  These ones give less detail.
 
-In fact for Audacity 2.4.0 you should read those
-instructions rather than these ones, since we switched to 
-CMake for building Audacity itself for 2.4.0
 
 Some prerequisites:
 
@@ -66,16 +63,27 @@ wxWidgets:
 
 Audacity:
 
-These are old instructions.  See our wiki and use 
+See our wiki for more detailed build instructions, including how to 
-CMake for 2.4.0 and later, rather than as here automake.
+install CMake.
 
-  1) Create a 'build' subdirectory under Audacity and change to it.
 
-  2) Now to build Audacity itself.  
+1. Make a build directory under the audacity git directory.
-    Using a build directory (and .. in the command) keeps source and object files
-    in separate directories.
 
-    ../configure --with-lib-preference="local system"
+  cd audacity
+  mkdir build-cmake
+  cd build-cmake
+
+
+2. Generate the makefiles
+
+  cmake -DCMAKE_BUILD_TYPE=Release ..
+
+3. Build Audacity 
+
+  cmake --build . 
+
+4. Run
+
+  cd bin/Release
+  ./audacity
 
-    make
-    make install  # as root

win/build.txt

@@ -1,6 +1,7 @@
 Instructions for building on Windows.
 
-Fuller instructions that include 
+Fuller instructions that include
+   * Installing CMake 
    * Portable Settings
    * Building an Installer
 can be found on our wiki at http://wiki.audacityteam.org/wiki/Building_On_Windows