3 files changed, 17 insertions, 9 deletions
diff --git a/system/pax/README b/system/pax/README
index ff74637561ec..dcafcf26a462 100644
--- a/system/pax/README
+++ b/system/pax/README
@@ -1,3 +1,2 @@
-Pax is the POSIX standard archive tool.
-It supports the two most common forms of standard archive (backup)
-files - CPIO and TAR.
+Pax is the POSIX standard archive tool.  It supports the two most
+common forms of standard archive (backup) files - CPIO and TAR.
diff --git a/system/pax/pax.SlackBuild b/system/pax/pax.SlackBuild
index 6cfd06bab891..5a9ee4ae28de 100644
--- a/system/pax/pax.SlackBuild
+++ b/system/pax/pax.SlackBuild
@@ -32,10 +32,13 @@ 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"
 fi
 
 set -e
@@ -56,6 +59,7 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -65,8 +69,10 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -75,12 +81,13 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+cp -a \
+  ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 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}
diff --git a/system/pax/pax.info b/system/pax/pax.info
index faad229d4730..d4a180c5a91d 100644
--- a/system/pax/pax.info
+++ b/system/pax/pax.info
@@ -3,6 +3,8 @@ VERSION="3.4"
 HOMEPAGE="http://slackware.com/~alien/slackbuilds/pax/"
 DOWNLOAD="http://slackware.com/~alien/slackbuilds/pax/build/pax-3.4.tar.bz2"
 MD5SUM="fbd9023b590b45ac3ade95870702a0d6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Ben Collver"
 EMAIL="bencollver@gmail.com"
 APPROVED="rworkman"