summaryrefslogtreecommitdiffstats
path: root/academic
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-05-26 22:15:36 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-05-26 23:57:57 -0500
commitec15963a5e5255d8e7c159bbd60f92fb0996ae27 (patch)
treee309c926332c6c9fae5ccea0bce55095a1a77525 /academic
parent662a654d419f2b813ad359837108e69945209ff8 (diff)
downloadslackbuilds-ec15963a5e5255d8e7c159bbd60f92fb0996ae27.tar.gz
slackbuilds-ec15963a5e5255d8e7c159bbd60f92fb0996ae27.tar.xz
academic/g3data: Miscellaneous cleanup and typo fix
Thanks to Serban Udrea for the heads-up on the typo.
Diffstat (limited to 'academic')
-rw-r--r--academic/g3data/doinst.sh1
-rw-r--r--academic/g3data/g3data.SlackBuild19
-rw-r--r--academic/g3data/g3data.desktop2
3 files changed, 17 insertions, 5 deletions
diff --git a/academic/g3data/doinst.sh b/academic/g3data/doinst.sh
index 5fb28930db..4e8ba7071d 100644
--- a/academic/g3data/doinst.sh
+++ b/academic/g3data/doinst.sh
@@ -1,3 +1,4 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
diff --git a/academic/g3data/g3data.SlackBuild b/academic/g3data/g3data.SlackBuild
index ede53cce55..0be826f916 100644
--- a/academic/g3data/g3data.SlackBuild
+++ b/academic/g3data/g3data.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=g3data
VERSION=${VERSION:-1.5.3}
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -49,9 +61,8 @@ CPPFLAGS="$SLKCFLAGS" make
mkdir -p $PKG/usr/bin $PKG/usr/man/man1
make install bindir=$PKG/usr/bin mandir=$PKG/usr/man
-mkdir -p $PKG/usr/share/applications
-cat $CWD/g3data.desktop > $PKG/usr/share/applications/g3data.destop
-mkdir -p $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/g3data.desktop > $PKG/usr/share/applications/g3data.desktop
cat $CWD/g3data.xpm > $PKG/usr/share/pixmaps/g3data.xpm
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/g3data/g3data.desktop b/academic/g3data/g3data.desktop
index 4d50442085..af9b1e22ff 100644
--- a/academic/g3data/g3data.desktop
+++ b/academic/g3data/g3data.desktop
@@ -5,4 +5,4 @@ Exec=g3data
Icon=g3data
Terminal=false
Type=Application
-Categories=Science;Graphics;
+Categories=Education;Science;Graphics;