From 546b05fa8f017b1521bea720a40e86af6ef218d9 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Fri, 2 May 2008 17:44:17 +0000 Subject: [PATCH] When computing dirs in auto_dir also consider symlink entries. Use metaprefix to locate metadata when adding relnotes. --- buildpkg.packaging.solaris | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris index 9fedda0..692c2c4 100644 --- a/buildpkg.packaging.solaris +++ b/buildpkg.packaging.solaris @@ -436,7 +436,7 @@ auto_dir() local i local j - fdirs=$($AWK '/^f/ { print $3 }' $metadir/prototype.$secname | $SED -e 's,\(.*\)/.*$,\1,' | $SORT -u) + fdirs=$($AWK '/^[fs]/ { print $3 }' $metadir/prototype.$secname | $SED -e 's,\(.*\)/.*$,\1,' | $SORT -u) ddirs=$($AWK '/^d/ { print $3 }' $metadir/prototype.$secname | $SORT -u) for i in $fdirs @@ -713,7 +713,7 @@ parse_def() if [ "${line:0:4}" == "dir " ]; then add_dir $defaultperms $defaultuid $defaultgid "${line:4}" $secname # Add dir entry elif [ "${line:0:12}" = "default_docs" ]; then - add_proto $defaultperms $defaultuid $defaultgid "${line:12}${_docdir}/${secname}-${version}" $secname # Add std. doc location + add_proto $defaultperms $defaultuid $defaultgid "${line:12}${metaprefix}${_docdir}/${secname}-${version}" $secname # Add std. doc location else add_proto $defaultperms $defaultuid $defaultgid "$line" $secname # Build protype file from filespec fi