Update install documentation

firehol · Nov 22, 2016 · 92a8cfa · 92a8cfa
1 parent caedbcd
commit 92a8cfa
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -76,21 +76,24 @@ make
 make install
 ~~~~
 
-Since all components will go under `/usr/local`, you may prefer something
-like this:
+To not have files appear under /usr/local, try something like:
 
 ~~~~
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 make
 make install
 ~~~~
 
+If your O/S does not usually have a `/usr/libexec`, you may want
+to add `--libexecdir=/usr/lib` to the `configure`.
+
 You can get help on the options available (including disabling unwanted
 components) by running:
 
 ~~~~
 ./configure --help
 ~~~~
+
 From version 3.0.0 it is no longer recommended to install firehol by
 copying files, since a function library is now used, in addition to
 the scripts.

diff --git a/doc/firehol/introduction.md b/doc/firehol/introduction.md
@@ -31,25 +31,38 @@ download area](http://firehol.org/download/).
 
 Unpack and change directory with:
 
-    tar xfz firehol-version.tar.gz
-    cd firehol-version
-          
+~~~~
+tar xfz firehol-version.tar.gz
+cd firehol-version
+~~~~
+
+From version 3.0.0 it is no longer recommended to install firehol by
+copying files, since a function library is now used, in addition to
+the scripts.
 
 Options for the configure program can be seen in the INSTALL file and by
 running:
 
-    ./configure --help
-          
+~~~~
+./configure --help
+~~~~
 
 To build and install taking the default options:
 
-    ./configure && make && sudo make install
-          
+~~~~
+./configure && make && sudo make install
+~~~~
+
+To not have files appear under /usr/local, try something like:
 
-Since all components (including configuration files) will go
-under `/usr/local`, you may prefer to configure more like this:
+~~~~
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+make
+make install
+~~~~
 
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib
+If your O/S does not usually have a `/usr/libexec`, you may want
+to add `--libexecdir=/usr/lib` to the `configure`.
 
 All of the common SysVInit command line arguments are recognised which
 makes it easy to deploy the script as a startup service.

diff --git a/doc/fireqos/introduction.md b/doc/fireqos/introduction.md
@@ -31,22 +31,39 @@ download area](http://firehol.org/download/).
 
 Unpack and change directory with:
 
-    tar xfz firehol-version.tar.gz
-    cd firehol-version
-          
+~~~~
+tar xfz firehol-version.tar.gz
+cd firehol-version
+~~~~
+
+From version 3.0.0 it is no longer recommended to install firehol by
+copying files, since a function library is now used, in addition to
+the scripts.
 
 Options for the configure program can be seen in the INSTALL file and by
 running:
 
-    ./configure --help
-          
+~~~~
+./configure --help
+~~~~
 
 To build and install taking the default options:
 
-    ./configure && make && sudo make install
-          
+~~~~
+./configure && make && sudo make install
+~~~~
+
+To not have files appear under /usr/local, try something like:
+
+~~~~
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+make
+make install
+~~~~
+
+If your O/S does not usually have a `/usr/libexec`, you may want
+to add `--libexecdir=/usr/lib` to the `configure`.
 
-Alternatively, just copy the `sbin/fireqos.in` file to where you want it.
 All of the common SysVInit command line arguments are recognised which
 makes it easy to deploy the script as a startup service.
 

diff --git a/doc/vnetbuild/introduction.md b/doc/vnetbuild/introduction.md
@@ -31,24 +31,38 @@ download area](http://firehol.org/download/).
 
 Unpack and change directory with:
 
-    tar xfz firehol-version.tar.gz
-    cd firehol-version
-          
+~~~~
+tar xfz firehol-version.tar.gz
+cd firehol-version
+~~~~
+
+From version 3.0.0 it is no longer recommended to install firehol by
+copying files, since a function library is now used, in addition to
+the scripts.
 
 Options for the configure program can be seen in the INSTALL file and by
 running:
 
-    ./configure --help
-          
+~~~~
+./configure --help
+~~~~
 
 To build and install taking the default options:
 
-    ./configure && make && sudo make install
-          
+~~~~
+./configure && make && sudo make install
+~~~~
+
+To not have files appear under /usr/local, try something like:
+
+~~~~
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+make
+make install
+~~~~
 
-Alternatively, just copy the `sbin/vnetbuild.in` file to where you want it.
-All of the common SysVInit command line arguments are recognised which
-makes it easy to deploy the script as a startup service.
+If your O/S does not usually have a `/usr/libexec`, you may want
+to add `--libexecdir=/usr/lib` to the `configure`.
 
 Packages are available for most distributions and you can use your
 distribution's standard commands (e.g. aptitude, yum, etc.) to install