diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:01:31 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:01:31 -0400 |
| commit | 5aa5c503a75c5db5de69eeb9ac92562cb623b31e (patch) | |
| tree | 3716454ff6bb5a9dbf8e28a4850d32a4f1dd35de | |
| parent | 50979a6837bb6b5ffc31e8bc1877d7c38bb05888 (diff) | |
| download | slackbuilds-5aa5c503a75c5db5de69eeb9ac92562cb623b31e.tar.gz | |
desktop/scrotwm: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | desktop/scrotwm/scrotwm.SlackBuild | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/desktop/scrotwm/scrotwm.SlackBuild b/desktop/scrotwm/scrotwm.SlackBuild index 396bdfd66b..2ec973a786 100644 --- a/desktop/scrotwm/scrotwm.SlackBuild +++ b/desktop/scrotwm/scrotwm.SlackBuild @@ -29,24 +29,36 @@ PRGNAM=scrotwm VERSION=0.9.23 -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 OUTPUT=${OUTPUT:-/tmp} -if [ "${ARCH}" == "i486" ];then - SLKCFLAGS='-O2 -march=i486 -mtune=i686' - LIBDIRSUFFIX='' -elif [ "$ARCH" == "i686" ]; then - SLKCFLAGS='-O2 -march=i686 -mtune=i686' - LIBDIRSUFFIX='' -elif [ "${ARCH}" == "x86_64" ];then - SLKCFLAGS='-O2 -fPIC' - LIBDIRSUFFIX='64' +if [ "$ARCH" = "i486" ];then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |