summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 03:30:33 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:46 -0500
commit0065eaba19013bbc48ba2b6b95f4ec2d67301c3b (patch)
tree05952abe2453c4879496a821622f3b956640edd8
parent7392318707dac1e1c325dcb19dd4d5c58bcabc2e (diff)
downloadslackbuilds-0065eaba19013bbc48ba2b6b95f4ec2d67301c3b.tar.gz
network/pptpd: Miscellaneous cleanups
-rw-r--r--network/pptpd/pptpd.SlackBuild21
1 files changed, 15 insertions, 6 deletions
diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild
index 89551690d7..26de3710e0 100644
--- a/network/pptpd/pptpd.SlackBuild
+++ b/network/pptpd/pptpd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for pptpd
-# Copyright 2007-2009 Robby Workman, Northport, Alabama, USA
+# Copyright 2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
@@ -25,10 +25,19 @@
PRGNAM=pptpd
VERSION=1.3.4
-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
@@ -80,10 +92,7 @@ make install DESTDIR=$PKG
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
- 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 {} \;
# Add some sample config files
mkdir -p $PKG/etc/ppp