diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:14:39 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:14:39 -0400 |
| commit | 11d036cd24afa8448989cd4b6ed6664c96f32b5d (patch) | |
| tree | fb9844086dd720e945b551fcdff0d2a3c8fedd7b | |
| parent | 9f7c84d81a7228aa0cabead005242668f7343ff6 (diff) | |
| download | slackbuilds-11d036cd24afa8448989cd4b6ed6664c96f32b5d.tar.gz | |
office/calibre: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | office/calibre/calibre.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/office/calibre/calibre.SlackBuild b/office/calibre/calibre.SlackBuild index 77df24a13b..c9638bb892 100644 --- a/office/calibre/calibre.SlackBuild +++ b/office/calibre/calibre.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=calibre VERSION=${VERSION:-0.5.14} -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 @@ -39,6 +48,9 @@ elif [ "$ARCH" = "i686" ]; then LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |