summaryrefslogtreecommitdiff
path: root/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-18 16:35:06 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-18 16:35:06 -0500
commit690e5c4b75b2b43698aa1bc025ed4db6920427bd (patch)
treecb2dbe7ea7c23124f92f603a55a8a96f283f883f /desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
parent55a2e414ba4e814422afc85dd0a8a7ad90c935e5 (diff)
downloadslackbuilds-690e5c4b75b2b43698aa1bc025ed4db6920427bd.tar.gz
desktop/thunar-archive-plugin: Miscellaneous cleanups.
Diffstat (limited to 'desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild')
-rw-r--r--desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild26
1 files changed, 17 insertions, 9 deletions
diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
index c99a6257a3..1fd207a519 100644
--- a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
+++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for thunar-archive-plugin
-# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,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=thunar-archive-plugin
VERSION=0.2.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) 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
@@ -50,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -73,12 +85,8 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \