1 files changed, 12 insertions, 6 deletions
diff --git a/desktop/afterstep/afterstep.SlackBuild b/desktop/afterstep/afterstep.SlackBuild
index 2b5579e277..05d0d4ae93 100644
--- a/desktop/afterstep/afterstep.SlackBuild
+++ b/desktop/afterstep/afterstep.SlackBuild
@@ -4,7 +4,7 @@
 # Written by NetrixTardis (netrixtardis@stealth3.com)
 
 PRGNAM=afterstep
-VERSION=${VERSION:-2.2.8}
+VERSION=${VERSION:-2.2.9}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -14,14 +14,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM=${SRCNAM:-AfterStep}	# leave this alone
+SRCNAM=AfterStep	# leave this alone
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -39,11 +42,14 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-i18n \
   --enable-alsa \
+  --with-helpcommand="rxvt -e man" \
+  --with-imageloader="" \
   --build=$ARCH-slackware-linux
 
 make
@@ -56,6 +62,9 @@ make install DESTDIR=$PKG
     xargs strip --strip-unneeded 2> /dev/null
 )
 
+# Take care of default xinitrc
+install -D -m 0755 $CWD/xinitrc.afterstep $PKG/etc/X11/xinit/xinitrc.afterstep
+
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/afterstep/doc/ $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYRIGHT ChangeLog INSTALL NEW README TEAM UPGRADE doc/menu.txt \
@@ -67,11 +76,8 @@ cp -a COPYRIGHT ChangeLog INSTALL NEW README TEAM UPGRADE doc/menu.txt \
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-# Take care of default xinitrc
-install -D -m 0755 $CWD/xinitrc.afterstep $PKG/etc/X11/xinit/xinitrc.afterstep
-
 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}