summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2010-05-13 00:34:08 +0200
committer Robby Workman <rworkman@slackbuilds.org>2010-05-13 00:34:08 +0200
commit4cf9e554244d0066f4846985d230bf2729737771 (patch)
tree364cd767413e63ac971905b9789253cc172df99c
parentd2dccecbb494fff7886d67ab5305dac3c6081588 (diff)
downloadslackbuilds-4cf9e554244d0066f4846985d230bf2729737771.tar.gz
slackbuilds-4cf9e554244d0066f4846985d230bf2729737771.tar.xz
misc/cwiid: Updated for version 0.6.00
-rw-r--r--misc/cwiid/cwiid.SlackBuild8
-rw-r--r--misc/cwiid/cwiid.info2
2 files changed, 8 insertions, 2 deletions
diff --git a/misc/cwiid/cwiid.SlackBuild b/misc/cwiid/cwiid.SlackBuild
index 27e534cd51..7f1cdfa6db 100644
--- a/misc/cwiid/cwiid.SlackBuild
+++ b/misc/cwiid/cwiid.SlackBuild
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -42,6 +45,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib$LIBDIRSUFFIX \
--sysconfdir=/etc \
--localstatedir=/var \
--docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -54,7 +58,7 @@ make
make install DESTDIR=$PKG
# For some reason --disable-static is ignored
-rm -f $PKG/usr/lib/libcwiid.a
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/libcwiid.a
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -76,4 +80,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/cwiid/cwiid.info b/misc/cwiid/cwiid.info
index c5406b2cc0..3daba201fe 100644
--- a/misc/cwiid/cwiid.info
+++ b/misc/cwiid/cwiid.info
@@ -2,7 +2,9 @@ PRGNAM="cwiid"
VERSION="0.6.00"
HOMEPAGE="http://abstrakraft.org/cwiid/"
DOWNLOAD="http://abstrakraft.org/cwiid/downloads/cwiid-0.6.00.tgz"
+DOWNLOAD_x86_64=""
MD5SUM="8d574afdeedc5e5309c87a72d744316a"
+MD5SUM_x86_64=""
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
APPROVED="rworkman"