3 files changed, 21 insertions, 10 deletions
diff --git a/development/jam/jam.SlackBuild b/development/jam/jam.SlackBuild
index 9f10609665..be49e9117e 100644
--- a/development/jam/jam.SlackBuild
+++ b/development/jam/jam.SlackBuild
@@ -2,33 +2,44 @@
 
 # Slackware build script for jam
 # Written by Erik Hanson  erik@slackbuilds.org
-
-# This one's kinda wacky.
+# Thanks to Andrew Brouwers for some improvements.
 
 PRGNAM=jam
 VERSION=2.5
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip || exit 1
+unzip $CWD/$PRGNAM-$VERSION.zip
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make || exit 1
-mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp jam0 $PKG/usr/bin/jam
+make
+./jam0 -sBINDIR=$PKG/usr/bin -sOPTIM="$SLKCFLAGS" install
 strip --strip-unneeded $PKG/usr/bin/jam
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
 cp -a Jam.html Jambase.html Jamfile.html Porting README RELNOTES \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/jam/jam.info b/development/jam/jam.info
index 5ba2b070ff..f89006c55b 100644
--- a/development/jam/jam.info
+++ b/development/jam/jam.info
@@ -5,4 +5,4 @@ DOWNLOAD="ftp://ftp.perforce.com/jam/jam-2.5.zip"
 MD5SUM="f92caadb62fe4cb0b152eff508c9d450"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/development/jam/slack-desc b/development/jam/slack-desc
index b94a5a46a1..b07b38ab00 100644
--- a/development/jam/slack-desc
+++ b/development/jam/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-jam: Jam (Make(1) Redux)
+jam: Jam (Make Redux)
 jam: 
 jam: Jam is a program construction tool, like make(1). Jam recursively
 jam: builds target files from source files, using dependency information