--- SlackBuild	2006-04-03 20:26:27.000000000 -0400
+++ SlackBuild.s390x	2005-12-31 01:32:56.000000000 -0500
@@ -7,7 +7,7 @@
 PKG=$TMP/package-autofs
 
 VERSION=3.1.7
-ARCH=i386
+ARCH=${ARCH:-i486}
 BUILD=1
 
 if [ ! -d $TMP ]; then
@@ -27,19 +27,22 @@
 mkdir -p $PKG/usr/doc/autofs-$VERSION
 cp -a COPYING COPYRIGHT NEWS README README.options TODO \
   multiserver_mount.patch samples $PKG/usr/doc/autofs-$VERSION
-chown -R root:root $PKG/usr/doc/autofs-$VERSION
+chown -R root.root $PKG/usr/doc/autofs-$VERSION
 find $PKG/usr/doc/autofs-$VERSION -type d -exec chmod 755 {} \;
 find $PKG/usr/doc/autofs-$VERSION -type f -exec chmod 644 {} \;
-./configure --prefix=/usr i386-slackware-linux
+./configure --prefix=/usr \
+            --libdir=/usr/lib64 \
+            ${ARCH}-slackware-linux
 make
 cd daemon
 mkdir -p $PKG/usr/sbin
 cat automount > $PKG/usr/sbin/automount
+chown root.bin $PKG/usr/sbin/automount
 chmod 755 $PKG/usr/sbin/automount
 cd ../modules
-mkdir -p $PKG/usr/lib/autofs
+mkdir -p $PKG/usr/lib64/autofs
 for file in *.so ; do
-  cat $file > $PKG/usr/lib/autofs/$file
+  cat $file > $PKG/usr/lib64/autofs/$file
 done
 cd ../man
 mkdir -p $PKG/usr/man/man5 $PKG/usr/man/man8
@@ -50,6 +53,7 @@
   cat $file | gzip -9c > $PKG/usr/man/man8/$file.gz
 done
 strip $PKG/usr/sbin/*
+chown -R root.bin $PKG/usr/sbin
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
