diff options
author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:15:37 -0400 |
---|---|---|
committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:15:37 -0400 |
commit | 049597a9645f71b8a7535ae013c478c0688692ff (patch) | |
tree | 8763faa79c6bd1b7e674b5c906ec426b62e79534 | |
parent | 27c1357eb3640be90fd81136ada86e7f02c27f52 (diff) |
system/fpm2: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r-- | system/fpm2/fpm2.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/system/fpm2/fpm2.SlackBuild b/system/fpm2/fpm2.SlackBuild index 2ea0b93f1e4a7..9426b1d4674ad 100644 --- a/system/fpm2/fpm2.SlackBuild +++ b/system/fpm2/fpm2.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=fpm2 VERSION=${VERSION:-0.78} -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) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG |