diff options
| author |   Matteo Bernardini <matteo.bernardini@sns.it> | 2010-05-29 21:18:35 +0200 |
|---|---|---|
| committer |   Robby Workman <rworkman@slackbuilds.org> | 2010-06-01 01:01:59 -0500 |
| commit | 0617de4c1b60d340cf7b68af0b3e5b040d79231b (patch) | |
| tree | 767f3e6e85585ce5556c413dba32532880e2d647 /desktop | |
| parent | 1a46c5a8c0fc9ca06ded8108441e7d43c4977052 (diff) | |
| download | slackbuilds-0617de4c1b60d340cf7b68af0b3e5b040d79231b.tar.gz slackbuilds-0617de4c1b60d340cf7b68af0b3e5b040d79231b.tar.xz | |
desktop/wmCalClock: miscellaneous cleanups
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/wmCalClock/wmCalClock.SlackBuild | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild index 6ce12001d4..bc068e5a62 100644 --- a/desktop/wmCalClock/wmCalClock.SlackBuild +++ b/desktop/wmCalClock/wmCalClock.SlackBuild @@ -7,10 +7,19 @@ PRGNAM=wmCalClock VERSION=${VERSION:-1.25} -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 @@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -42,7 +54,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; - cd Src make \ CFLAGS="$SLKCFLAGS" \ |