diff options
| author | dsomero <xgizzmo@gmail.com> | 2010-05-23 23:26:59 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-23 23:31:13 -0500 |
| commit | 5ffcce15a652babb4503efb7bc239696c6c2b300 (patch) | |
| tree | 34539ec15b1d048dc484e694d5e632c85af951ca | |
| parent | 51a3ab900726f87fd28ac613ef1a586b2313c6d5 (diff) | |
| download | slackbuilds-5ffcce15a652babb4503efb7bc239696c6c2b300.tar.gz | |
system/xtrs: Miscellaneous cleanups.
| -rw-r--r-- | system/xtrs/xtrs.SlackBuild | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/system/xtrs/xtrs.SlackBuild b/system/xtrs/xtrs.SlackBuild index b2b789defa..d81b414742 100644 --- a/system/xtrs/xtrs.SlackBuild +++ b/system/xtrs/xtrs.SlackBuild @@ -7,10 +7,19 @@ PRGNAM=xtrs VERSION=4.9d -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 @@ -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 @@ -78,4 +90,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |