diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index 7174210b2..659f7a69f 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -271,7 +271,7 @@ for f in lib.* ; do
echo "Library ${f#*.} file installed as ${DESTDIR}/usr/share/shorewall/$f"
done
-if [ $BUILD = apple ]; then
+if [ $BUILD != apple ]; then
eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/usr/share/shorewall/lib.cli
eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/usr/share/shorewall/lib.cli
else
diff --git a/docs/Anatomy.xml b/docs/Anatomy.xml
index 064e3cdd5..225b49e84 100644
--- a/docs/Anatomy.xml
+++ b/docs/Anatomy.xml
@@ -106,7 +106,7 @@
The /sbin/shorewall shell program is used to
interact with Shorewall. See shorewall(8).
+ url="manpages/shorewall.html">shorewall(8).
diff --git a/docs/Install.xml b/docs/Install.xml
index c37213606..09107e2c3 100644
--- a/docs/Install.xml
+++ b/docs/Install.xml
@@ -263,6 +263,9 @@
Beginning with Shorewall 4.4.20, you can specify an absolute
path name for LIBEXEC, in which case the listed executables will
be installed in ${LIBEXEC}/shorewall*.
+
+ Beginning with Shorewall 4.5.1, you must specify an absolute
+ pathname for LIBEXEC.
@@ -280,10 +283,302 @@
Beginning with Shorewall 4.4.20, you can specify an absolute
path name for PERLLIB, in which case the Shorewall Perl modules
will be installed in ${PERLLIB}/Shorewall/.
+
+ Beginning with Shorewall 4.5.1, you must specify an absolute
+ pathname for PERLLIB.
+
+
+ Default Install Locations
+
+ The default install locations are distribution dependent as shown
+ in the following sections. These are the locations that are chosen by
+ the install.sh scripts.
+
+
+ All Distributions
+
+
+
+
+
+ COMPONENT
+
+ LOCATION
+
+
+
+ man pages
+
+ /usr/share/man/ (may ve overridden using
+ MANDIR)
+
+
+
+ Shorewall Perl Modules
+
+ /usr/share/shorewall/ (may be overridden using
+ PERLLIB)
+
+
+
+ Executable helper scripts (compiler.pl, getparams,
+ wait4ifup)
+
+ /usr/share/shorewall/ (may be overridden using
+ LIBEXEC)
+
+
+
+ ifupdown.sh (from Shorewall-init)
+
+ /usr/share/shorewall-init/ (may be overridden using
+ LIBEXEC)
+
+
+
+
+
+
+
+ Debian
+
+
+
+
+
+ COMPONENT
+
+ LOCATION
+
+
+
+ CLI programs
+
+ /sbin/product
+
+
+
+ Distribution-specific configuration file
+
+ /etc/default/product
+
+
+
+ Init Scripts
+
+ /etc/init.d/product
+
+
+
+ ifupdown scripts from Shorewall-init
+
+ /etc/network/if-up.d/shorewall,
+ /etc/network/if-post-down.d/shorewall
+
+
+
+ ppp ifupdown scripts from Shorewall-init
+
+ /etc/ppp/ip-up.d/shorewall,
+ /etc/ppp/ip-down.d/shorewall /etc/ppp/ipv6-up.d/shorewall
+ /etc/ppp/ipv6-down.d/shorewall
+
+
+
+
+
+
+
+ Redhat and Derivatives
+
+
+
+
+
+ COMPONENT
+
+ LOCATION
+
+
+
+ CLI programs
+
+ /sbin/product
+
+
+
+ Distribution-specific configuration file
+
+ /etc/sysconfig/product
+
+
+
+ Init Scripts
+
+ /etc/rc.d/init.d/product
+
+
+
+ ifupdown scripts from Shorewall-init
+
+ /sbin/ifup-local, /sbin/ifdown-local
+
+
+
+ ppp ifupdown scripts from Shorewall-init
+
+ /etc/ppp/ip-up.local, /etc/ppp/ip-down.local
+
+
+
+
+
+
+
+ SuSE
+
+
+
+
+
+ COMPONENT
+
+ LOCATION
+
+
+
+ CLI programs
+
+ /sbin/product
+
+
+
+ Distribution-specific configuration file
+
+ /etc/sysconfig/product
+
+
+
+ Init Scripts
+
+ /etc/init.d/product
+
+
+
+ ifupdown scripts from Shorewall-init
+
+ /etc/sysconfig/network/if-up.d/shorewall,
+ /etc/sysconfig/network/if-down.d/shorewall
+
+
+
+ ppp ifupdown scripts from Shorewall-init
+
+ /etc/ppp/ip-up.d/shorewall,
+ /etc/ppp/ip-down.d/shorewall /etc/ppp/ipv6-up.d/shorewall
+ /etc/ppp/ipv6-down.d/shorewall
+
+
+
+
+
+
+
+ Cygwin
+
+
+
+
+
+ COMPONENT
+
+ LOCATION
+
+
+
+ CLI programs
+
+ /bin/product
+
+
+
+ Distribution-specific configuration file
+
+ N/A
+
+
+
+ Init Scripts
+
+ N/A
+
+
+
+ ifupdown scripts from Shorewall-init
+
+ N/A
+
+
+
+ ppp ifupdown scripts from Shorewall-init
+
+ N/A
+
+
+
+
+
+
+
+ OS X
+
+
+
+
+
+ COMPONENT
+
+ LOCATION
+
+
+
+ CLI programs
+
+ /sbin/product
+
+
+
+ Distribution-specific configuration file
+
+ N/A
+
+
+
+ Init Scripts
+
+ N/A
+
+
+
+ ifupdown scripts from Shorewall-init
+
+ N/A
+
+
+
+ ppp ifupdown scripts from Shorewall-init
+
+ N/A
+
+
+
+
+
+