diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-19 12:45:52 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 01:17:17 -0500 |
| commit | b099baa32624c0f5ad444fef5fa3ae7de49abe9b (patch) | |
| tree | ac265c67eac149c5b19a13528532b8626a69fb94 | |
| parent | df1bd0558135716098b1ec5301b9945f267b7f92 (diff) | |
| download | slackbuilds-b099baa32624c0f5ad444fef5fa3ae7de49abe9b.tar.gz | |
system/xarchiver: Miscellaneous cleanups.
| -rw-r--r-- | system/xarchiver/xarchiver.SlackBuild | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild index 1f8c0a16d1..e987f1625d 100644 --- a/system/xarchiver/xarchiver.SlackBuild +++ b/system/xarchiver/xarchiver.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=xarchiver VERSION=${VERSION:-0.5.2} -ARCH=${ARCH:-i486} BUILD=${BUILD:-3} 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 @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -86,7 +98,7 @@ make install-strip DESTDIR=$PKG mv $PKG/usr/share/doc $PKG/usr mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -( cd $PKG/usr/doc ; ln -s xarchiver-$VERSION xarchiver ) +cd $PKG/usr/doc ; ln -s xarchiver-$VERSION xarchiver ; cd - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |