1 files changed, 21 insertions, 18 deletions
diff --git a/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.SlackBuild b/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.SlackBuild
index a33692a233..ab88a22245 100644
--- a/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.SlackBuild
+++ b/desktop/Xfce-Theme-Manager/Xfce-Theme-Manager.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Xfce-Theme-Manager
 
@@ -22,38 +22,42 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Xfce-Theme-Manager
-VERSION=${VERSION:-0.3.4}
+VERSION=${VERSION:-0.3.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-TARNAM=$(echo $PRGNAM | tr [:upper:] [:lower:])
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+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}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -62,7 +66,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -73,9 +77,8 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
-  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -86,14 +89,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mv $PKG/usr/share/man $PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/Xfce-Theme-Manager/docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/Xfce-Theme-Manager/docs
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-ln -s ../../doc/$PRGNAM-$VERSION $PKG/usr/share/Xfce-Theme-Manager/docs
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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