3 files changed, 13 insertions, 6 deletions
diff --git a/system/sdl-jstest/README b/system/sdl-jstest/README
index 3e1a770d74..609fecff44 100644
--- a/system/sdl-jstest/README
+++ b/system/sdl-jstest/README
@@ -7,5 +7,5 @@ displaying the events they send or by displaying their current button,
 axis, hat or ball state. sdl-jstest is especially useful if you want
 to test your SDL Linux joystick configuration.
 
-Optional dependency: if SDL2 is installed, the SDL2 version will
-be built and installed as sdl2-jstest.
+The package includes both sdl-jstest (SDL 1.2) and sdl2-jstest (SDL
+2.0) executables.
diff --git a/system/sdl-jstest/sdl-jstest.SlackBuild b/system/sdl-jstest/sdl-jstest.SlackBuild
index c5a1e0ee7b..f3861cd72e 100644
--- a/system/sdl-jstest/sdl-jstest.SlackBuild
+++ b/system/sdl-jstest/sdl-jstest.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sdl-jstest
 
@@ -40,10 +40,13 @@
 # - upstream now supports both sdl1 and sdl2, build for sdl2 only
 #   if installed
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sdl-jstest
 VERSION=${VERSION:-20180715_aafbdb1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -53,7 +56,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -119,4 +126,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info
index cf78c56ffc..7b24db98b5 100644
--- a/system/sdl-jstest/sdl-jstest.info
+++ b/system/sdl-jstest/sdl-jstest.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"