1 files changed, 10 insertions, 8 deletions
diff --git a/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild b/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild
index e2967ba0e3..5ba42e6008 100644
--- a/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild
+++ b/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild
@@ -37,8 +37,7 @@ SRCNAM="uld"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i386 ;;
-    
+    i?86) ARCH=i586 ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -55,11 +54,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i386" ]; then
+if [[ $ARCH = i?86 ]]; then
+  SRCARCH=i386
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
+  SRCARCH="x86_64"
 else
+  SRCARCH=i386
   LIBDIRSUFFIX=""
 fi
 
@@ -79,13 +81,13 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/bin
-cp -a $ARCH/smfpnetdiscovery $ARCH/usbresetter $PKG/usr/bin
+cp -a $SRCARCH/smfpnetdiscovery $SRCARCH/usbresetter $PKG/usr/bin
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/sane $PKG/usr/lib${LIBDIRSUFFIX}/cups/filter/
-cp -a $ARCH/libscmssc.so $PKG/usr/lib${LIBDIRSUFFIX}
-cp -a $ARCH/libsane-smfp.so* $PKG/usr/lib${LIBDIRSUFFIX}/sane
+cp -a $SRCARCH/libscmssc.so $PKG/usr/lib${LIBDIRSUFFIX}
+cp -a $SRCARCH/libsane-smfp.so* $PKG/usr/lib${LIBDIRSUFFIX}/sane
 cp -a \
-  $ARCH/rastertospl $ARCH/pstosecps \
+  $SRCARCH/rastertospl $SRCARCH/pstosecps \
   $PKG/usr/lib${LIBDIRSUFFIX}/cups/filter/
 
 mkdir -p $PKG/usr/share
@@ -116,7 +118,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a noarch/license/* $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 noarch/license/* -t $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.pdfprinterrors > $PKG/usr/doc/$PRGNAM-$VERSION/README.pdfprinterrors
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild