summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 03:02:12 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:45 -0500
commit4d041346135bb782c2f21c2ae980a1b65cfb0137 (patch)
treeaf5023ef25ae142ca08daa1f6e3f4e0e0b4a2330
parent029dd1c3d0ffe75ca5630029ccd752548424dbaf (diff)
downloadslackbuilds-4d041346135bb782c2f21c2ae980a1b65cfb0137.tar.gz
network/conntrack-tools: Miscellaneous cleanups
-rw-r--r--network/conntrack-tools/conntrack-tools.SlackBuild21
1 files changed, 15 insertions, 6 deletions
diff --git a/network/conntrack-tools/conntrack-tools.SlackBuild b/network/conntrack-tools/conntrack-tools.SlackBuild
index 23197424c8..1714374937 100644
--- a/network/conntrack-tools/conntrack-tools.SlackBuild
+++ b/network/conntrack-tools/conntrack-tools.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for conntrack-tools
-# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA
+# 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=conntrack-tools
VERSION=0.9.14
-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
@@ -79,10 +91,7 @@ cat doc/stats/conntrackd.conf > $PKG/etc/conntrackd/conntrackd.conf.sample
find $PKG | xargs file | grep -e "executable" -e "shared object"| grep ELF | \
cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man || exit 1
- 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/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING INSTALL TODO doc/cli doc/sync doc/manual \