summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-05-18 13:46:30 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-05-18 13:46:30 -0500
commit39ec2a909468e778024bb4b9491eae06470bf1ca (patch)
tree703ca4fd8db3ef92a456649b99f321aff8144776 /system
parent99115d2b649df5ec3b7202fbba087fd9e65bf04d (diff)
downloadslackbuilds-39ec2a909468e778024bb4b9491eae06470bf1ca.tar.gz
slackbuilds-39ec2a909468e778024bb4b9491eae06470bf1ca.tar.xz
system/sshfs-fuse: Miscellaneous script cleanup.
Diffstat (limited to 'system')
-rw-r--r--system/sshfs-fuse/slack-desc1
-rw-r--r--system/sshfs-fuse/sshfs-fuse.SlackBuild20
2 files changed, 16 insertions, 5 deletions
diff --git a/system/sshfs-fuse/slack-desc b/system/sshfs-fuse/slack-desc
index 9c5f406c6b..150eeaf2fd 100644
--- a/system/sshfs-fuse/slack-desc
+++ b/system/sshfs-fuse/slack-desc
@@ -16,3 +16,4 @@ sshfs-fuse: logging into the server with ssh.
sshfs-fuse:
sshfs-fuse:
sshfs-fuse:
+sshfs-fuse:
diff --git a/system/sshfs-fuse/sshfs-fuse.SlackBuild b/system/sshfs-fuse/sshfs-fuse.SlackBuild
index fdc197157d..755900df2f 100644
--- a/system/sshfs-fuse/sshfs-fuse.SlackBuild
+++ b/system/sshfs-fuse/sshfs-fuse.SlackBuild
@@ -22,10 +22,19 @@
PRGNAM=sshfs-fuse
VERSION=2.2
-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
@@ -40,6 +49,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
# Exit on most errors
@@ -74,10 +86,8 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog FAQ.txt INSTALL NEWS README \