Merge pull request #26 from swmarc/issue/8/sqg-apply-directory-structure-to-slackbuild

Moved sqg functions to /usr/libexec
Modified sbopkg.SlackBuild to use  /usr/libexec

closed #25 #26

src/usr/libexec/sbopkg/sqg/functions

@@ -169,11 +169,11 @@ execute_build () {
   if [ $? -eq 1 ]; then
     printf '%s\n' "${PKGSNEW[@]}" | \
       parallel --eta --will-cite --jobs $JOBS \
-      /usr/share/sbopkg/sqg/sqg-build-queuefile \
+      /usr/libexec/sbopkg/sqg/sqg-build-queuefile \
       "$REPO_DIR" "$QUEUEDIR" {} "$SKIP_EMPTY" $VERBOSE
   else
     for PKG in "${PKGSNEW[@]}"; do
-      /usr/share/sbopkg/sqg/sqg-build-queuefile \
+      /usr/libexec/sbopkg/sqg/sqg-build-queuefile \
         "$REPO_DIR" "$QUEUEDIR" "$PKG" "$SKIP_EMPTY" $VERBOSE
     done
   fi

src/usr/libexec/sbopkg/sqg/sqg-build-queuefile

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # source all sqg functions
-. /usr/share/sbopkg/sqg/functions
+. /usr/libexec/sbopkg/sqg/functions
 
 REPO_DIR="$1"
 QUEUEDIR="$2"

src/usr/sbin/sqg

@@ -48,7 +48,7 @@ REPO_BRANCH=${REPO_BRANCH:-$(cat /etc/slackware-version | awk '{print $2}')}
 ### NO CHANGES SHOULD BE NECESSARY BELOW THIS LINE ###
 
 # source all sqg functions
-. /usr/share/sbopkg/sqg/functions
+. /usr/libexec/sbopkg/sqg/functions
 
 SCRIPT=${0##*/}
 

tools/sbopkg.SlackBuild

@@ -42,6 +42,9 @@ mv $PKG/etc/sbopkg/sbopkg.conf $PKG/etc/sbopkg/sbopkg.conf.new
 mkdir -p $PKG/usr/sbin
 cp usr/sbin/* $PKG/usr/sbin
 
+mkdir -p $PKG/usr/libexec/$PRGNAM
+cp -ar usr/libexec/$PRGNAM/* $PKG/usr/libexec/$PRGNAM
+
 mkdir -p $PKG/usr/man
 cp -a usr/man/* $PKG/usr/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;