diff options
| author |   Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 10:44:24 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 23:21:40 -0500 |
| commit | 840936e77c911c66dc78b09ef543bba35c2a2941 (patch) | |
| tree | e4908038b2974ca1c1c3034cb48183326b7398ef /system | |
| parent | 3f233ac396a9612f14582641147a09229306dc19 (diff) | |
| download | slackbuilds-840936e77c911c66dc78b09ef543bba35c2a2941.tar.gz slackbuilds-840936e77c911c66dc78b09ef543bba35c2a2941.tar.xz | |
system/preload: Miscellaneous cleanups.
Diffstat (limited to 'system')
| -rw-r--r-- | system/preload/preload.SlackBuild | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/system/preload/preload.SlackBuild b/system/preload/preload.SlackBuild index 657eae8f0e..f770f69661 100644 --- a/system/preload/preload.SlackBuild +++ b/system/preload/preload.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for preload -# Copyright 2008,2009 Robby Workman Northport, Alabama (USA) +# Copyright 2008,2009,2010 Robby Workman Northport, Alabama (USA) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=preload VERSION=0.6.3 -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 @@ -69,8 +81,10 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSON \ --build=$ARCH-slackware-linux -make \ - pkgdocdir=/usr/doc/$PRGNAM-$VERSION +cp $CWD/preload.8 . + +make pkgdocdir=/usr/doc/$PRGNAM-$VERSION || \ + make pkgdocdir=/usr/doc/$PRGNAM-$VERSION make install \ pkgdocdir=/usr/doc/$PRGNAM-$VERSION \ DESTDIR=$PKG |