Update install instructions

2 files changed, 19 insertions, 21 deletions

diff --git a/INSTALL b/INSTALL
index 51c9c06..8c25e99 100644
--- a/INSTALL
+++ b/INSTALL
@@ -68,10 +68,8 @@ c) Install PostgreSQL and Apache2 development files. Specifically, we need
    Fedora/RHEL:   posqtgresql-devel   apr-devel   libapreq2-devel httpd-devel
    FreeBSD:       postgresqlXY-client apr         libapreq2       apache24
 
-d) Unless you already have the build2 toolchain installed, download (normally
-   from https://download.build2.org) and install build2-toolchain by following
-   its INSTALL file instructions. You can build build2-toolchain using brep's
-   login and in its home directory.
+d) Unless you already have the build2 toolchain, install it by following
+   instructions on https://build2.org/install.xhtml.
 
    Note that brep loader (discussed below) runs bpkg so it makes sense to have
    both from the same release.
@@ -92,16 +90,16 @@ below.
 $ mkdir brep
 $ cd brep
 
-bpkg create                                    \
-  cc                                           \
-  config.cc.poptions="-I$(apxs -q includedir)" \
-  config.bin.rpath=/home/brep/install/lib      \
-  config.install.root=/home/brep/install
+$ bpkg create                                   \
+   cc                                           \
+   config.cc.poptions="-I$(apxs -q includedir)" \
+   config.bin.rpath=$HOME/install/lib           \
+   config.install.root=$HOME/install
 
-bpkg add https://pkg.cppget.org/1/alpha
-bpkg fetch
-bpkg build brep ?sys:libapr1 ?sys:libapreq2 ?sys:libpq
-bpkg install brep
+$ bpkg add https://pkg.cppget.org/1/alpha
+$ bpkg fetch
+$ bpkg build brep ?sys:libapr1 ?sys:libapreq2 ?sys:libpq
+$ bpkg install brep
 
 $ cd .. # Back to brep home.
 
diff --git a/INSTALL-DEV b/INSTALL-DEV
index e6c46cd..da27c8f 100644
--- a/INSTALL-DEV
+++ b/INSTALL-DEV
@@ -12,13 +12,13 @@ user under which Apache2 is running (See the "User" directive in the Apache2
 Check that the files in the brep/ directory are readable by "others". If they
 are not, then run the following two commands to grant Apache2 read access:
 
-setfacl -Rdm g:www-data:rx brep
-setfacl -n -Rm g:www-data:rx brep
+$ setfacl -Rdm g:www-data:rx brep
+$ setfacl -n -Rm g:www-data:rx brep
 
 And also for all the directories leading up to brep/, for example, if you have
 ~/projects/brep/, then:
 
-setfacl -m g:www-data:rx ~/ ~/projects
+$ setfacl -m g:www-data:rx ~/ ~/projects
 
 Note: strictly speaking www-data in the above two commands is the Apache2
 group, not user. However, most installations use the same name for both.
@@ -208,11 +208,11 @@ $ sudo tail -f /var/log/apache2/error.log
 To do a "complete reload" (i.e., recreate database schemes, load the repository
 data, and reload the Apache2 plugin), execute the following from brep/:
 
-migrate/brep-migrate --recreate package
-migrate/brep-migrate --recreate build
-load/brep-load --bpkg ../bpkg/bpkg/bpkg tests/load/loadtab
-sudo /etc/init.d/apache2 restart
-sudo systemctl restart apache2
+$ migrate/brep-migrate --recreate package
+$ migrate/brep-migrate --recreate build
+$ load/brep-load --bpkg ../bpkg/bpkg/bpkg tests/load/loadtab
+$ sudo /etc/init.d/apache2 restart
+$ sudo systemctl restart apache2
 
 Note that if instead you need to recreate the whole databases (e.g., migration
 is not possible), then one way to do it would be: