aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-22 23:07:47 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:42 -0500
commit9190deed3253f96a90aded9d582235a0cc36a60a (patch)
treef18235ca12b6791f271dde071b66ab3aefbdcece
parenta4e51aa41b180d240835aaa2655d4402163319f8 (diff)
development/nvi: Miscellaneous cleanups.
-rw-r--r--development/nvi/nvi.SlackBuild24
1 files changed, 18 insertions, 6 deletions
diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild
index b8d56b7bca8e3..95b04fa8eb472 100644
--- a/development/nvi/nvi.SlackBuild
+++ b/development/nvi/nvi.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for nvi
-# Copyright 2008-2009 Robby Workman Northport, Alabama (USA)
+# Copyright 2008,2009,2010 Robby Workman Northport, Alabama (USA)
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
PRGNAM=nvi
VERSION=1.81.6
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -78,17 +90,17 @@ cd build.unix
cd -
# These are better as softlinks instead of hardlinks
-( cd $PKG/usr/man/man1
+cd $PKG/usr/man/man1
rm nex.1 nview.1
ln -s nvi.1 nex.1
ln -s nvi.1 nview.1
-)
+cd -
-( cd $PKG/usr/man
+cd $PKG/usr/man
rm -rf cat*
find . -type f -exec gzip -9 {} \;
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+cd -
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \