academic/g3data: Miscellaneous cleanup and typo fix

Thanks to Serban Udrea for the heads-up on the typo.
This commit is contained in:
Robby Workman 2010-05-26 22:15:36 -05:00
parent 662a654d41
commit ec15963a5e
3 changed files with 17 additions and 5 deletions

View file

@ -1,3 +1,4 @@
if [ -x /usr/bin/update-desktop-database ]; then if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi fi

View file

@ -7,10 +7,19 @@
PRGNAM=g3data PRGNAM=g3data
VERSION=${VERSION:-1.5.3} VERSION=${VERSION:-1.5.3}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} 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) CWD=$(pwd)
TMP=${TMP:-/tmp/SBo} TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM PKG=$TMP/package-$PRGNAM
@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC" SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64" LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi fi
set -e set -e
@ -49,9 +61,8 @@ CPPFLAGS="$SLKCFLAGS" make
mkdir -p $PKG/usr/bin $PKG/usr/man/man1 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
make install bindir=$PKG/usr/bin mandir=$PKG/usr/man make install bindir=$PKG/usr/bin mandir=$PKG/usr/man
mkdir -p $PKG/usr/share/applications mkdir -p $PKG/usr/share/{applications,pixmaps}
cat $CWD/g3data.desktop > $PKG/usr/share/applications/g3data.destop cat $CWD/g3data.desktop > $PKG/usr/share/applications/g3data.desktop
mkdir -p $PKG/usr/share/pixmaps
cat $CWD/g3data.xpm > $PKG/usr/share/pixmaps/g3data.xpm cat $CWD/g3data.xpm > $PKG/usr/share/pixmaps/g3data.xpm
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION

View file

@ -5,4 +5,4 @@ Exec=g3data
Icon=g3data Icon=g3data
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Science;Graphics; Categories=Education;Science;Graphics;