1 files changed, 14 insertions, 14 deletions
diff --git a/system/pwsafe/pwsafe.SlackBuild b/system/pwsafe/pwsafe.SlackBuild
index c622fde3ec9ac..ed9a528fd5697 100644
--- a/system/pwsafe/pwsafe.SlackBuild
+++ b/system/pwsafe/pwsafe.SlackBuild
@@ -4,14 +4,14 @@
 # Written by Tom Fitzhenry <tom@fitzhenry.name> 2007/08/22
 # Modified by Robby Workman  20071025
 
-APP=pwsafe
-VERSION=0.2.0
+PRGNAM=pwsafe
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -19,11 +19,11 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$APP
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+      SLKCFLAGS="-O2 -march=i586 -mtune=i686"
       LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
       SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -40,10 +40,10 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$APP-$VERSION
+rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$APP-$VERSION.tar.gz
-cd $APP-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,15 +71,15 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz; rm $i; done
 )
 
-mkdir -p $PKG/usr/doc/$APP-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-    $PKG/usr/doc/$APP-$VERSION
-cat $CWD/$APP.SlackBuild > $PKG/usr/doc/$APP-$VERSION/$APP-SlackBuild
-find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
+    $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}