aboutsummaryrefslogtreecommitdiff
path: root/system/daa2iso
diff options
context:
space:
mode:
authorDavid Woodfall <dave@dawoodfall.net>2018-03-27 12:54:38 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-03-31 07:41:33 +0700
commit56d0f08feac2e4089a8dd22deb5f845a2bbc8427 (patch)
treeda9f5ef5a51940fab4f90f7aa886e624dd77b0c1 /system/daa2iso
parente936e109efdf4590b6dd00a80080224a7b7c96c6 (diff)
system/daa2iso: Switch to i586.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'system/daa2iso')
-rw-r--r--system/daa2iso/README4
-rw-r--r--system/daa2iso/daa2iso.SlackBuild13
2 files changed, 9 insertions, 8 deletions
diff --git a/system/daa2iso/README b/system/daa2iso/README
index 26d00deb4113d..127c9903a5a87 100644
--- a/system/daa2iso/README
+++ b/system/daa2iso/README
@@ -1,2 +1,2 @@
-daa2iso is a command-line tool for converting DAA and GBI images to the
-ISO format. See file daa2iso.txt for more documentation.
+daa2iso is a command-line tool for converting DAA and GBI images to the
+ISO format. See file daa2iso.txt for more documentation.
diff --git a/system/daa2iso/daa2iso.SlackBuild b/system/daa2iso/daa2iso.SlackBuild
index ee7aa329eba35..1d76c9938ce95 100644
--- a/system/daa2iso/daa2iso.SlackBuild
+++ b/system/daa2iso/daa2iso.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for daa2iso
-# Copyright 2009 David Woodfall <dave@unrealize.co.uk>
+# Copyright 2009 David Woodfall <dave@dawoodfall.net>
# All rights reserved.
#
# aka dive in #slackware on freenode.net
@@ -26,12 +26,12 @@
PRGNAM=daa2iso
VERSION=${VERSION:-0.1.7e}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,7 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS" \
+make
# Makefile does not support DESTDIR.
install -m 755 -D $PRGNAM $PKG/usr/bin/$PRGNAM