diff options
| author |   Robby Workman | 2010-05-19 23:35:59 +0200 |
|---|---|---|
| committer | Robby Workman | 2010-05-21 08:29:22 +0200 |
| commit | ea40c4195435b74a71d553242ac399c44339c6b2 (patch) | |
| tree | 0b59e8330efd571d1680a0eff4e366ab6b68e39d /academic | |
| parent | 13cdf3311f96ce059f14b1db0f47b8793295df13 (diff) | |
| download | slackbuilds-ea40c4195435b74a71d553242ac399c44339c6b2.tar.gz | |
academic/engauge: Miscellaneous cleanups.
Diffstat (limited to 'academic')
| -rw-r--r-- | academic/engauge/README | 2 | ||||
| -rw-r--r-- | academic/engauge/engauge.SlackBuild | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/academic/engauge/README b/academic/engauge/README index 6bf5688f63..b9e5529c49 100644 --- a/academic/engauge/README +++ b/academic/engauge/README @@ -5,4 +5,4 @@ to a spreadsheet. Engauge Digitizer compensates for rotation, scaling and skew (also known as shearing) in graphs. Engauge recognizes BMP, GIF, JPG, PNG, PNM, and XPM bitmaps. -This requires fftw (and qt3 from the /extra/kde3-compat/ packages). +This requires qt3 from the /extra/kde3-compat/ packages. diff --git a/academic/engauge/engauge.SlackBuild b/academic/engauge/engauge.SlackBuild index 768ba5a8c1..8baf1f840a 100644 --- a/academic/engauge/engauge.SlackBuild +++ b/academic/engauge/engauge.SlackBuild @@ -5,10 +5,19 @@ PRGNAM=engauge VERSION=4.1 -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 @@ -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 |