summaryrefslogtreecommitdiffstats
path: root/office/osmo
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-05-19 14:39:32 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-05-21 01:28:57 -0500
commit7ccff91950a5cbe8a07c0695dcb54f21ced3e795 (patch)
tree265e4f2bffd6a6ffc42f32f846fd47d68cf80494 /office/osmo
parent3128765b674b4fb59aa49ab203d2d19609b72dcc (diff)
downloadslackbuilds-7ccff91950a5cbe8a07c0695dcb54f21ced3e795.tar.gz
slackbuilds-7ccff91950a5cbe8a07c0695dcb54f21ced3e795.tar.xz
office/osmo: Miscellaneous cleanups.
Diffstat (limited to 'office/osmo')
-rw-r--r--office/osmo/README3
-rw-r--r--office/osmo/osmo.SlackBuild20
2 files changed, 16 insertions, 7 deletions
diff --git a/office/osmo/README b/office/osmo/README
index 749e5ff825..4e7cb6b3f2 100644
--- a/office/osmo/README
+++ b/office/osmo/README
@@ -2,5 +2,4 @@ Osmo is a handy personal organizer which includes calendar, task manager
and address book modules. It was designed to be a small, easy to use and
good looking PIM tool to help to manage personal information.
-Optional build-time dependencies are libnotify, libsyncml, and libtar.
-libgringotts, which is not available at SlackBuilds.org, is also optional.
+Optional build-time dependencies are libsyncml, libgringotts, and libtar.
diff --git a/office/osmo/osmo.SlackBuild b/office/osmo/osmo.SlackBuild
index 942867f3b5..1d0b6de2c1 100644
--- a/office/osmo/osmo.SlackBuild
+++ b/office/osmo/osmo.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=osmo
VERSION=${VERSION:-0.2.8}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -50,6 +59,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -80,10 +92,8 @@ CFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
-( 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 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING README* TRANSLATORS \