3 files changed, 14 insertions, 5 deletions
diff --git a/office/auctex/auctex.SlackBuild b/office/auctex/auctex.SlackBuild
index 25c9045e39..49b0e3dc86 100644
--- a/office/auctex/auctex.SlackBuild
+++ b/office/auctex/auctex.SlackBuild
@@ -17,10 +17,13 @@ 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
@@ -42,17 +45,21 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --infodir=/usr/info
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -72,4 +79,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/office/auctex/auctex.info b/office/auctex/auctex.info
index 055f87fc0c..0592cd2124 100644
--- a/office/auctex/auctex.info
+++ b/office/auctex/auctex.info
@@ -3,6 +3,8 @@ VERSION="11.85"
 HOMEPAGE="http://www.gnu.org/software/auctex/"
 DOWNLOAD="http://ftp.gnu.org/pub/gnu/auctex/auctex-11.85.tar.gz"
 MD5SUM="597c2adbee11877fe1f9b57baf0ba165"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Aleksandar Samardzic"
 EMAIL="asamardzic@gmail.com"
 APPROVED="dsomero"
diff --git a/office/auctex/slack-desc b/office/auctex/slack-desc
index 59ec081c7a..fd397b6e3a 100644
--- a/office/auctex/slack-desc
+++ b/office/auctex/slack-desc
@@ -12,7 +12,7 @@ auctex: AUCTeX is an extensible package for writing and formatting TeX
 auctex: files in GNU Emacs and XEmacs.  It supports many different TeX
 auctex: macro packages, including AMS-TeX, LaTeX, Texinfo, ConTeXt, and
 auctex: docTeX (dtx files).
-auctex: 
+auctex:
 auctex: Auctex home page is: http://www.gnu.org/software/auctex/
 auctex:
 auctex: