From 8bcfa9a17dfb32c20cd6c059a0b9e1f001d9cb80 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 23 May 2010 02:02:35 -0500 Subject: libraries/libsexy: Miscellaneous cleanups. --- libraries/libsexy/libsexy.SlackBuild | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libraries/libsexy/libsexy.SlackBuild b/libraries/libsexy/libsexy.SlackBuild index 3688f9e9b5..6084a7a387 100644 --- a/libraries/libsexy/libsexy.SlackBuild +++ b/libraries/libsexy/libsexy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libsexy -# Copyright 2008-2009 Robby Workman - http://rlworkman.net +# 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=libsexy VERSION=0.1.11 -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,9 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION -( cd $PKG/usr/doc/$PRGNAM-$VERSION - ln -s /usr/share/gtk-doc/html/libsexy html -) +( cd $PKG/usr/doc/$PRGNAM-$VERSION ln -s /usr/share/gtk-doc/html/libsexy html ) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -- cgit v1.2.3