diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 42dc0cf04..21611283c 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -131,6 +131,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
#
DEBIAN=
CYGWIN=
+INSTALLD='-D'
case $(uname) in
CYGWIN*)
@@ -142,6 +143,9 @@ case $(uname) in
OWNER=$(id -un)
GROUP=$(id -gn)
;;
+ Darwin)
+ INSTALLD=
+ ;;
*)
[ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=root
@@ -300,15 +304,17 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules"
cd manpages
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}/usr/share/man/man8/
+
for f in *.5; do
gzip -c $f > $f.gz
- run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
+ run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
done
for f in *.8; do
gzip -c $f > $f.gz
- run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
+ run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
done
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index d29c74c02..4de7eb9e4 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -112,6 +112,7 @@ CYGWIN=
MAC=
SPARSE=
MANDIR=${MANDIR:-"/usr/share/man"}
+INSTALLD='-D'
case $(uname) in
CYGWIN*)
@@ -129,12 +130,13 @@ case $(uname) in
if [ -z "$PREFIX" ]; then
DEST=
INIT=
+ SPARSE=Yes
fi
[ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel
MAC=Yes
- SPARSE=Yes
+ INSTALLD=
;;
*)
[ -z "$OWNER" ] && OWNER=root
@@ -834,15 +836,17 @@ fi
cd manpages
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/
+
for f in *.5; do
gzip -c $f > $f.gz
- run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
+ run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz"
done
for f in *.8; do
gzip -c $f > $f.gz
- run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
+ run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz"
done
diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index f877fc971..d308da92d 100755
--- a/Shorewall6-lite/install.sh
+++ b/Shorewall6-lite/install.sh
@@ -130,6 +130,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
# Determine where to install the firewall script
#
DEBIAN=
+INSTALLD='-D'
case $(uname) in
CYGWIN*)
@@ -141,6 +142,9 @@ case $(uname) in
OWNER=$(id -un)
GROUP=$(id -gn)
;;
+ Darwin)
+ INSTALLD=
+ ;;
*)
[ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=root
@@ -299,15 +303,17 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall6-lite/modules"
cd manpages
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}/usr/share/man/man8/
+
for f in *.5; do
gzip -c $f > $f.gz
- run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
+ run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
done
for f in *.8; do
gzip -c $f > $f.gz
- run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
+ run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
done
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index 004d44e8a..60fd2ca7f 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -112,6 +112,7 @@ CYGWIN=
MAC=
MANDIR=${MANDIR:-"/usr/share/man"}
SPARSE=
+INSTALLD='-D'
case $(uname) in
CYGWIN*)
@@ -129,12 +130,13 @@ case $(uname) in
if [ -z "$PREFIX" ]; then
DEST=
INIT=
+ SPARSE=Yes
fi
[ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel
MAC=Yes
- SPARSE=Yes
+ INSTALLD=
;;
*)
[ -z "$OWNER" ] && OWNER=root
@@ -693,15 +695,17 @@ fi
cd manpages
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/
+
for f in *.5; do
gzip -c $f > $f.gz
- run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
+ run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz"
done
for f in *.8; do
gzip -c $f > $f.gz
- run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
+ run_install $INSTALLD -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz"
done
diff --git a/docs/shorewall_setup_guide.xml b/docs/shorewall_setup_guide.xml
index 518a03c8e..a83bc3b1f 100644
--- a/docs/shorewall_setup_guide.xml
+++ b/docs/shorewall_setup_guide.xml
@@ -363,7 +363,7 @@ all all REJECT info
class="devicefile">ppp0 or ippp0 then you will want to set CLAMPMSS=yes
in /etc/shorewall/shorewall.conf.
+ url="manpages/shorewall.conf.html">/etc/shorewall/shorewall.conf.
Your Local Interface will be an Ethernet
adapter (eth0,
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index c06de1f21..720358702 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -59,7 +59,7 @@
For most Shorewall logging, a level of 6 (info) is appropriate.
Shorewall log messages are generated by NetFilter and are logged using
- facility 'kern' and the level that you specifify. If you are unsure of the
+ facility 'kern' and the level that you specify. If you are unsure of the
level to choose, 6 (info) is a safe bet. You may specify levels by name or
by number.