aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-20 14:29:47 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:48:17 -0500
commitc3e3a9ced9e4415b79b1f375268bfe451eb5d6dc (patch)
tree9ee44170f5d1f19df5d15466c4fe95c56acfe9f1
parent45aaa1ad0897bc3d73ec4eeed11558cb3b1c11e8 (diff)
academic/calcoo: Miscellaneous cleanups.
-rw-r--r--academic/calcoo/calcoo.SlackBuild21
1 files changed, 15 insertions, 6 deletions
diff --git a/academic/calcoo/calcoo.SlackBuild b/academic/calcoo/calcoo.SlackBuild
index 1ef26210a34ea..a5542c0a32b62 100644
--- a/academic/calcoo/calcoo.SlackBuild
+++ b/academic/calcoo/calcoo.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for calcoo
-# Copyright 2006-2009 Robby Workman (http://rlworkman.net)
+# Copyright 2006,2007,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=calcoo
VERSION=1.3.16
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -72,10 +84,7 @@ cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/man || exit
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc