--- gucharmap.SlackBuild	2006-04-03 20:47:17.000000000 -0400
+++ gucharmap.SlackBuild.s390x	2006-08-20 18:04:34.000000000 -0400
@@ -11,7 +11,7 @@
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
 elif [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "s390" ]; then
+elif [ "$ARCH" = "s390x" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
@@ -34,6 +34,7 @@
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir='${exec_prefix}/lib64' \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
   --enable-static=no \
@@ -41,6 +42,7 @@
   $ARCH-slackware-linux
 make -j3
 make install DESTDIR=$PKG
+chown -R root:bin $PKG/usr/bin
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
