diff options
| author |   David Somero | 2010-06-04 07:14:52 +0200 |
|---|---|---|
| committer | David Somero | 2010-06-04 07:14:52 +0200 |
| commit | d2b4d7a9f567b04d5d8c22f853c522044a36c3e7 (patch) | |
| tree | 312065df104009e50d56619b327847d1a919e974 /office | |
| parent | 205a79741bc42a70ca374ca3f702041e3069815c (diff) | |
| download | slackbuilds-d2b4d7a9f567b04d5d8c22f853c522044a36c3e7.tar.gz | |
office/odt2txt: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
| -rw-r--r-- | office/odt2txt/odt2txt.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/office/odt2txt/odt2txt.SlackBuild b/office/odt2txt/odt2txt.SlackBuild index 31b13eab48..74d9df07db 100644 --- a/office/odt2txt/odt2txt.SlackBuild +++ b/office/odt2txt/odt2txt.SlackBuild @@ -5,10 +5,19 @@ PRGNAM=odt2txt VERSION=0.4 -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 @@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |