From 4b231f3e5acc34c5219c001d48104930c47f7636 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Fri, 21 May 2010 01:12:16 -0500 Subject: desktop/xfce4-screenshooter: Miscellaneous cleanups. --- .../xfce4-screenshooter.SlackBuild | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild') diff --git a/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild index 3b62f9f587..cab598ccf3 100644 --- a/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild +++ b/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-screenshooter -# 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=xfce4-screenshooter VERSION=1.6.0 -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 @@ -77,10 +89,7 @@ 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 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ -- cgit v1.2.3