1 files changed, 36 insertions, 15 deletions
diff --git a/system/gkrellm-volume/gkrellm-volume.SlackBuild b/system/gkrellm-volume/gkrellm-volume.SlackBuild
index ef680d37f9..524d2c3dcd 100644
--- a/system/gkrellm-volume/gkrellm-volume.SlackBuild
+++ b/system/gkrellm-volume/gkrellm-volume.SlackBuild
@@ -17,47 +17,68 @@
 
 # Modifed by the SlackBuilds.org project
 
-PKGNAME=gkrellm-volume
+PRGNAM=gkrellm-volume
 VERSION=2.1.13
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)		
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAME
-OUTPUT=${OUTPUT:-/tmp}	# Final location of package
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $PKGNAME-$VERSION
-tar -xvzf $CWD/$PKGNAME-$VERSION.tar.gz || exit 1
-cd $PKGNAME || exit 1
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
 # Patch the Makefile and po/Makefile to support DESTDIR
 patch -p1 < $CWD/Makefile.diff || exit 1
 
-make enable_nls=1 enable_alsa=1 || exit 1
-make enable_nls=1 enable_alsa=1 install DESTDIR=$PKG || exit 1
+make \
+  CFLAGS="$SLKCFLAGS" \
+  LOCALEDIR=/usr/share/locale \
+  PLUGIN_DIR=/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins \
+  GKRELLM_INCLUDE="-I/usr/include" \
+  enable_nls=1 \
+  enable_alsa=1
+
+make install \
+  LOCALEDIR=/usr/share/locale \
+  PLUGIN_DIR=/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins \
+  GKRELLM_INCLUDE="-I/usr/include" \
+  enable_nls=1 \
+  enable_alsa=1 \
+  DESTDIR=$PKG
 
 # Strip the .so file
-strip --strip-unneeded $PKG/usr/lib/gkrellm2/plugins/volume.so
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins/volume.so
 
-mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
-cp -a COPYRIGHT Changelog README THEMING  $PKG/usr/doc/$PKGNAME-$VERSION
-cp -a po/README $PKG/usr/doc/$PKGNAME-$VERSION/README.po
-cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYRIGHT Changelog README THEMING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a po/README $PKG/usr/doc/$PRGNAM-$VERSION/README.po
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}