1 files changed, 18 insertions, 10 deletions
diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild
index 63f80748..f52d2aa5 100755
--- a/source/d/nasm/nasm.SlackBuild
+++ b/source/d/nasm/nasm.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=nasm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -35,13 +36,20 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 else
   SLKCFLAGS="-O2"
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-nasm
 
@@ -50,7 +58,7 @@ mkdir -p $TMP $PKG
 cd $TMP
 rm -rf nasm-$VERSION
 tar xvf $CWD/nasm-$VERSION.tar.?z* || exit 1
-cd nasm-$VERSION
+cd nasm-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -65,11 +73,12 @@ CFLAGS="$SLKCFLAGS" \
   --build=${ARCH}-slackware-linux || exit 1
 
 make || exit 1
-make -C doc || exit 1
-
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/info
+( cd doc
+  make nasmdoc.txt || exit 1
+  mkdir -p $PKG/usr/doc/nasm-$VERSION
+  cp nasmdoc.txt $PKG/usr/doc/nasm-$VERSION
+) || exit 1
 make install INSTALLROOT=$PKG || exit 1
-cp -a doc/info/* $PKG/usr/info
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -80,7 +89,6 @@ cp -a \
   $PKG/usr/doc/nasm-$VERSION
 
 gzip -9 $PKG/usr/man/man?/*
-gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc