--- gaim.SlackBuild	2007-03-17 16:04:20.000000000 -0500
+++ gaim.SlackBuild.s390x	2009-06-30 00:38:42.000000000 -0400
@@ -11,7 +11,7 @@
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
 elif [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
+elif [ "$ARCH" = "s390x" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
@@ -31,6 +31,8 @@
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir='${exec_prefix}/lib64' \
+  --with-tclconfig=/usr/lib64 \
   --program-prefix="" \
   --program-suffix="" \
   $ARCH-slackware-linux
@@ -38,9 +40,9 @@
 make install DESTDIR=$PKG
 
 if [ -f $PKG/Gaim.pm ]; then # GAIM's perl module installer must be smoking crack
-  mkdir -p $PKG/usr/lib/perl5/5.8.8/i486-linux $PKG/usr/man/man3
-  mv $PKG/Gaim.pm $PKG/usr/lib/perl5/5.8.8/i486-linux
-  mv $PKG/auto $PKG/usr/lib/perl5/5.8.8/i486-linux
+  mkdir -p $PKG/usr/lib/perl5/5.8.8/s390x-linux $PKG/usr/man/man3
+  mv $PKG/Gaim.pm $PKG/usr/lib/perl5/5.8.8/s390x-linux
+  mv $PKG/auto $PKG/usr/lib/perl5/5.8.8/s390x-linux
   mv $PKG/Gaim.3 $PKG/usr/man/man3
 fi
 
@@ -51,6 +53,7 @@
   cd gaim-encryption-$GAIMENC
   ./configure \
   --prefix=/usr \
+  --libdir='${exec_prefix}/lib64' \
   --disable-static \
   --with-gaim=/tmp/gaim-$VERSION \
   --program-prefix="" \