From ad51e4da5699680e7d10269687cbfa37ce1bd0d6 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <matteo.bernardini@sns.it>
Date: Sat, 29 May 2010 09:18:07 +0200
Subject: multimedia/LiVES: fixed link to lives-exe binary

  Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 multimedia/LiVES/LiVES.SlackBuild | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/LiVES/LiVES.SlackBuild b/multimedia/LiVES/LiVES.SlackBuild
index eac024bc7f..4be6aa698d 100644
--- a/multimedia/LiVES/LiVES.SlackBuild
+++ b/multimedia/LiVES/LiVES.SlackBuild
@@ -9,10 +9,19 @@
 
 PRGNAM=LiVES
 VERSION=1.1.8
-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) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -24,9 +33,12 @@ if [ "$ARCH" = "i486" ]; then
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
- elif [ "$ARCH" = "x86_64" ]; then
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -55,6 +67,10 @@ CFLAGS="$SLKCFLAGS" \
 make docdir=/usr/doc/$PRGNAM-$VERSION
 make install-strip docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
 
+# fix wrong link to lives-exe binary
+rm $PKG/usr/bin/lives
+ln -s /usr/bin/lives-exe $PKG/usr/bin/lives
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-- 
cgit v1.2.3