diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:10:55 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:10:55 -0400 |
| commit | 1f259ce629acc600e318bc7e43077d151c22e299 (patch) | |
| tree | 685d93f7dbb7438e715ef8e9ade2cd87ae93cdfe | |
| parent | 3a00d70c1978a766da3326d15f7fc1353d742eed (diff) | |
| download | slackbuilds-1f259ce629acc600e318bc7e43077d151c22e299.tar.gz | |
misc/g15composer: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | misc/g15composer/g15composer.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/g15composer/g15composer.SlackBuild b/misc/g15composer/g15composer.SlackBuild index c248766714..3ed9d85492 100644 --- a/misc/g15composer/g15composer.SlackBuild +++ b/misc/g15composer/g15composer.SlackBuild @@ -26,12 +26,21 @@ PRGNAM=g15composer VERSION=${VERSION:-3.2} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} DOCS="README AUTHORS ChangeLog NEWS COPYING" +# 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 @@ -46,6 +55,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |