diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris index 6d5c71d..a59b514 100644 --- a/buildpkg.packaging.solaris +++ b/buildpkg.packaging.solaris @@ -663,6 +663,8 @@ parse_def() if [ $foundfiles -eq 1 ]; then # We already found the 'files' line so this must be the filelist 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 else add_proto $defaultperms $defaultuid $defaultgid "$line" $secname # Build protype file from filespec fi diff --git a/buildpkg.tools b/buildpkg.tools index 2ba03e8..422af4a 100644 --- a/buildpkg.tools +++ b/buildpkg.tools @@ -4,7 +4,7 @@ # Define tool programs in rpm style __ prefixed namespace __strip=/usr/bin/strip __uname=/usr/bin/uname -__tar=/usr/tgcware/bin/tar # GNU tar please! +__tar=/usr/tgcware/bin/tar # GNU tar v1.14 or better please! __vtar=/usr/bin/tar # vendor supplied tar __bzip2=/usr/bin/bzip2 __gzip=/usr/bin/gzip @@ -12,7 +12,7 @@ __patch=/usr/tgcware/bin/patch # GNU patch 2.5 or better please! __rm=/usr/bin/rm __rmdir=/usr/bin/rmdir __mkdir=/usr/bin/mkdir -__make=/usr/tgcware/bin/make # GNU make please! +__make=/usr/tgcware/bin/make # GNU make 3.80 or better please! __find=/usr/bin/find # vendor supplied find, GNU find will require changes to the script __xargs=/usr/bin/xargs __cat=/usr/bin/cat