1 files changed, 6 insertions, 13 deletions
diff --git a/system/foremost/foremost.SlackBuild b/system/foremost/foremost.SlackBuild
index 6fc6905ee0..13b654e3b8 100644
--- a/system/foremost/foremost.SlackBuild
+++ b/system/foremost/foremost.SlackBuild
@@ -3,16 +3,14 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=foremost
-VERSION=${VERSION:-1.5.6}
+VERSION=${VERSION:-1.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -24,16 +22,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
 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
@@ -52,15 +46,15 @@ find . \
  -exec chmod 644 {} \;
 
 # Set the $ARCH variable for the Makefile.
-sed -i "s|-O2|\$(CFLAGS)|" Makefile
+sed -i "s|-O2|$SLKCFLAGS|" Makefile
 # Set location of configuration file.
-sed -i 's|\/usr\/local\/etc|\/etc|' config.c
-# Fix segfaults with broken jpeg headers.
+sed -i 's|/usr/local||' config.c
+# Fix segfaults with broken jpeg.
 patch -p1 < $CWD/foremost-broken-jpeg.patch
 # Make the directories.
 mkdir -p $PKG/etc $PKG/usr/{man/man8,bin}
 
-make CFLAGS="$SLKCFLAGS"
+make
 make install \
   CONF=$PKG/etc \
   MAN=$PKG/usr/man/man8 \
@@ -78,8 +72,7 @@ cp -a \
   CHANGES README COPYRIGHT \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Remove executable priveleges from text files.
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc