From c7af716920f7f2d1c3c7eefb8adfc58b322be8ea Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 6 May 2010 11:23:14 -0700
Subject: [PATCH] Modify first attempts to allow installaton on a Mac

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/install.sh  | 8 ++++++--
 Shorewall6/install.sh | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index d29c74c02..19fb7a434 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*)
@@ -135,6 +136,7 @@ case $(uname) in
 	[ -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/install.sh b/Shorewall6/install.sh
index 004d44e8a..cd3a6807b 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*)
@@ -135,6 +136,7 @@ case $(uname) in
 	[ -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