From c900128e55134291e2d5dd0ec7ad18d97625cee3 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Thu, 22 Jan 2004 16:10:03 -0800
Subject: [contrib/solaris/buildpkg.sh] Allow for the possibility of /usr/local
 being a symbolic link. Fixes problem reported by Henry Grebler.

---
 contrib/solaris/buildpkg.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'contrib/solaris')

diff --git a/contrib/solaris/buildpkg.sh b/contrib/solaris/buildpkg.sh
index 55203d7d5..29d096306 100755
--- a/contrib/solaris/buildpkg.sh
+++ b/contrib/solaris/buildpkg.sh
@@ -23,9 +23,10 @@ SYSVINIT_NAME=opensshd
 MAKE=${MAKE:="make"}
 SSHDUID=67	# Default privsep uid
 SSHDGID=67	# Default privsep gid
-# uncomment these next two as needed
+# uncomment these next three as needed
 #PERMIT_ROOT_LOGIN=no
 #X11_FORWARDING=yes
+#USR_LOCAL_IS_SYMLINK=yes
 # list of system directories we do NOT want to change owner/group/perms
 # when installing our package
 SYSTEM_DIR="/etc	\
@@ -370,6 +371,12 @@ _EOF
 find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \
 	pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype
 
+# /usr/local is a symlink on some systems
+[ "${USR_LOCAL_IS_SYMLINK}" = yes ]  &&  {
+	grep -v "^d none /usr/local ? ? ?$" prototype > prototype.new
+	mv prototype.new prototype
+}
+
 ## Step back a directory and now build the package.
 echo "Building package.."
 cd ..
-- 
cgit v1.2.3