2 files changed, 12 insertions, 8 deletions
diff --git a/libraries/pexpect/pexpect.SlackBuild b/libraries/pexpect/pexpect.SlackBuild
index accf04524c..991f91ce1a 100644
--- a/libraries/pexpect/pexpect.SlackBuild
+++ b/libraries/pexpect/pexpect.SlackBuild
@@ -22,14 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Exit on most errors
-set -e
-
 PRGNAM=pexpect
 VERSION=2.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -37,10 +35,17 @@ 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -50,10 +55,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-python setup.py bdist
-
-tar xvzf dist/$PRGNAM-$VERSION.linux-i686.tar.gz -C $PKG
+python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a -r INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -63,4 +65,4 @@ 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/libraries/pexpect/pexpect.info b/libraries/pexpect/pexpect.info
index 975b01a84b..7506e9ed8a 100644
--- a/libraries/pexpect/pexpect.info
+++ b/libraries/pexpect/pexpect.info
@@ -2,7 +2,9 @@ PRGNAM="pexpect"
 VERSION="2.1"
 HOMEPAGE="http://pexpect.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/pexpect/pexpect-2.1.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="fd3d67ac085332f074cd665424dcd631"
+MD5SUM_x86_64=""
 MAINTAINER="Javier Rojas"
 EMAIL="jerojasro@gmail.com"
 APPROVED="rworkman"