--- freetype2.build64	2006-07-21 20:04:45.000000000 -0400
+++ freetype2.build64	2006-08-15 21:40:07.000000000 -0400
@@ -10,7 +10,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"
@@ -28,7 +28,7 @@
 rm --verbose -rf $DESTDIR/usr/include/freetype2 \
        $DESTDIR/usr/X11R6/include/freetype2 \
        $DESTDIR/usr/X11R6/include/ft2build.h \
-       $DESTDIR/usr/lib/libfreetype.* \
+       $DESTDIR/usr/lib64/libfreetype.* \
        $DESTDIR/usr/X11R6/lib/libfreetype.* \
        $DESTDIR/usr/X11R6/bin/freetype-config
 # It seems prudent to move this into /usr rather than /usr/X11R6, as *many* source bits
@@ -49,8 +49,7 @@
 # Another sky-is-falling bug:
 zcat $CWD/freetype-2.1.9-CVE-2006-1861-strlen.patch.gz | patch -p1 || exit 1
 chown -R root:root .
-CFLAGS="$SLKCFLAGS" make setup CFG="--prefix=/usr $ARCH-slackware-linux"
-make
+CFLAGS="$SLKCFLAGS" make -j3 setup CFG="--prefix=/usr --libdir=\'${exec_prefix}/lib64\' $ARCH-slackware-linux"
 make install DESTDIR=$DESTDIR
 ldconfig
 # This shouldn't be needed (apps should pick up -I/usr/include/freetype2 from