1 files changed, 31 insertions, 20 deletions
diff --git a/system/numactl/numactl.SlackBuild b/system/numactl/numactl.SlackBuild
index 073af3a683..4d729d9f3b 100644
--- a/system/numactl/numactl.SlackBuild
+++ b/system/numactl/numactl.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=numactl
-VERSION=${VERSION:-2.0.9}
+VERSION=${VERSION:-2.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -22,6 +22,20 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
@@ -37,20 +51,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-
-# Fix location of man-pages and docs
-sed \
-  -e "s|/share/man/|/man/|g" \
-  -e "s|/share/doc|/doc|g" \
-  -i Makefile
-
-# Erase the 0-length numastat file
-rm -f numastat
-
-make CFLAGS="-O3 -ffast-math -funroll-loops"
-make install PREFIX="$PKG/usr"
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -59,11 +74,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/doc/numactl/examples $PKG/usr/doc/$PRGNAM-$VERSION/.
-#Some cleaning up
-rmdir $PKG/usr/doc/numactl
-rmdir $PKG/usr/man/man2
+cp -a CHANGES README $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild