summaryrefslogtreecommitdiff
path: root/contrib/solaris
diff options
context:
space:
mode:
authortim <tim>2004-01-23 00:10:03 +0000
committertim <tim>2004-01-23 00:10:03 +0000
commit29514e2e6b1f6d902738c486407acaa4836c0a28 (patch)
tree30fa950197ff24db6602a47a2ba6deb3a1ff2494 /contrib/solaris
parentb5595178dcac2f04d9412ec66fc22ec8ca0bf0c8 (diff)
downloadopenssh-29514e2e6b1f6d902738c486407acaa4836c0a28.tar.gz
[contrib/solaris/buildpkg.sh] Allow for the possibility of
/usr/local being a symbolic link. Fixes problem reported by Henry Grebler.
Diffstat (limited to 'contrib/solaris')
-rwxr-xr-xcontrib/solaris/buildpkg.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/solaris/buildpkg.sh b/contrib/solaris/buildpkg.sh
index 55203d7d..29d09630 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 ..