1 files changed, 11 insertions, 17 deletions
diff --git a/development/acpica/acpica.SlackBuild b/development/acpica/acpica.SlackBuild
index 39586c69a3..b717ad88b2 100644
--- a/development/acpica/acpica.SlackBuild
+++ b/development/acpica/acpica.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for acpica
 
-# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=acpica
-VERSION=20120420
+VERSION=20130214
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,15 +43,19 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+  BITS="32"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  BITS="32"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  BITS="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  BITS="32"
 fi
 
 set -e
@@ -65,29 +69,19 @@ cd $PRGNAM-unix2-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-cd source/compiler
+cd generate/unix
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  make MAKEFLAGS="-j1"
-  install -D -m 0755 iasl $PKG/usr/bin/iasl
-  make clean
-cd -
+  make BITS=$BITS
 
-for i in acpiexec acpisrc acpixtract; do
-  cd source/tools/$i
-    CFLAGS="$SLKCFLAGS" \
-    CXXFLAGS="$SLKCFLAGS" \
-    make
-    install -D -m 0755 $i $PKG/usr/bin/$i
-    make clean
-  cd -
-done
+  make install DESTDIR=$PKG
+cd -
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changes.txt README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changes.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install