From f368c5abcf5eaa2231a1e32ba1dcc57ebe0cd03a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 26 Jan 2016 15:32:04 +0200
Subject: Minor changes to INSTALL, mostly style

---
 INSTALL | 53 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'INSTALL')

diff --git a/INSTALL b/INSTALL
index 3c08bed..93bb1d5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,11 +47,15 @@ issues, then you can adjust the commands below accordingly. Note that even if
     be built from source.]
 
     Download source packages for the two libraries from the same location as
-    build2-toolchain. Then unpack, build, and install:
+    build2-toolchain (https://download.build2.org). Then unpack, build, and
+    install:
+
+    $ cd lib*-X.Y.Z
+
+    $ ./configure --prefix=/usr/local \
+    CPPFLAGS=-I/usr/local/include     \
+    LDFLAGS=-L/usr/local/lib
 
-    $ cd libXXX-X.Y.Z
-    $ ./configure CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib \
-      --prefix=/usr/local
     $ make
     $ sudo make install
 
@@ -59,7 +63,8 @@ issues, then you can adjust the commands below accordingly. Note that even if
 
 3. Bootstrapping build2
 
-    The first step is to bootstrap the build2 build system:
+    Download build2-toolchain (https://download.build2.org) then unpack and
+    bootstrap the build2 build system:
 
     $ cd build2-toolchain-X.Y.Z
     $ cd build2/
@@ -67,20 +72,20 @@ issues, then you can adjust the commands below accordingly. Note that even if
     $ ./build/b-boot config.bin.rpath=/usr/local/lib update
 
     For more information on this step (for example, how to specify the C++
-    compiler to use, etc.) refer to the INSTALL file in the build2/
+    compiler, options, etc.), refer to the INSTALL file in the build2/
     subdirectory of build2-toolchain.
 
 4. Configuring, Building, and Installing the Rest of the Toolchain
 
     $ cd .. # back to build2-toolchain-X.Y.Z
 
-    $ ./build2/build/b                         \
-      config.cxx.poptions=-I/usr/local/include \
-      config.cxx.loptions=-L/usr/local/lib     \
-      config.bin.rpath=/usr/local/lib          \
-      config.install.root=/usr/local           \
-      config.install.root.sudo=sudo            \
-      configure
+    $ ./build2/build/b                       \
+    config.cxx.poptions=-I/usr/local/include \
+    config.cxx.loptions=-L/usr/local/lib     \
+    config.bin.rpath=/usr/local/lib          \
+    config.install.root=/usr/local           \
+    config.install.root.sudo=sudo            \
+    configure
 
     $ ./build2/build/b update
     $ ./build2/build/b install
@@ -88,13 +93,13 @@ issues, then you can adjust the commands below accordingly. Note that even if
     To test the installation, run:
 
     $ which b
+    /usr/local/bin/b
     $ b --version
 
     $ which bpkg
+    /usr/local/bin/bpkg
     $ bpkg --version
 
-    $ cd # back to home directory
-
 5. Setting up updates with the package manager
 
     If you only need to build this specific version of the toolchain, then you
@@ -108,24 +113,26 @@ issues, then you can adjust the commands below accordingly. Note that even if
     First, choose a directory where you would like bpkg to build everything,
     for example, build2-toolchain. Then:
 
+    $ cd # back to home directory
     $ mkdir build2-toolchain
     $ cd build2-toolchain
 
-    $ bpkg create                               \
-      cxx                                       \
-      config.cxx.poptions=-I/usr/local/include  \
-      config.cxx.loptions=-L/usr/local/lib      \
-      config.bin.rpath=/usr/local/lib           \
-      config.install.root=/usr/local            \
-      config.install.root.sudo=sudo
+    $ bpkg create                             \
+    cxx                                       \
+    config.cxx.poptions=-I/usr/local/include  \
+    config.cxx.loptions=-L/usr/local/lib      \
+    config.bin.rpath=/usr/local/lib           \
+    config.install.root=/usr/local            \
+    config.install.root.sudo=sudo
 
     $ bpkg add http://pkg.cppget.org/1/alpha
     $ bpkg fetch
     $ bpkg build build2 bpkg
     $ bpkg install build2 bpkg
 
-    Later, to upgrade to new a new version of the toolchain, simply execute:
+    Later, to upgrade to a new version of the toolchain, simply do:
 
     $ bpkg fetch
+    $ bpkg status build2 bpkg   # See if any upgrades are available.
     $ bpkg build build2 bpkg
     $ bpkg install build2 bpkg
-- 
cgit v1.1