summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Hernández Blas <hba.nihilismus@gmail.com>2010-05-13 00:39:57 +0200
committerErik Hanson <erik@slackbuilds.org>2010-05-13 00:39:57 +0200
commitfdf5e6c7b85946601610daa5402880862754292c (patch)
tree118f3e129cd05bc7ef0db2048a77adfd8b6244c4
parent8bc1d4e9f81b56a1914697efbb9845bd27d1e16d (diff)
downloadslackbuilds-fdf5e6c7b85946601610daa5402880862754292c.tar.gz
system/conky: Updated for version 1.6.1
-rw-r--r--system/conky/conky.SlackBuild6
-rw-r--r--system/conky/conky.info2
2 files changed, 7 insertions, 1 deletions
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index 14938aa721..67a3aa98bf 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LBIDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LBIDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LBIDIRSUFFIX="64"
fi
set -e
@@ -60,6 +63,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LBIDIRSUFFIX} \
--sysconfdir=/etc \
--mandir=/usr/man \
--enable-shared=yes \
@@ -93,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/conky/conky.info b/system/conky/conky.info
index a766fc6919..aecfc6ab61 100644
--- a/system/conky/conky.info
+++ b/system/conky/conky.info
@@ -2,7 +2,9 @@ PRGNAM="conky"
VERSION="1.6.1"
HOMEPAGE="http://conky.sourceforge.net"
DOWNLOAD="http://downloads.sourceforge.net/conky/conky-1.6.1.tar.bz2"
+DOWNLOAD_x86_64=""
MD5SUM="b2839f21cec18e5eaa338c7440a1ba28"
+MD5SUM_x86_64=""
MAINTAINER="Antonio Hernández Blas"
EMAIL="hba.nihilismus@gmail.com"
APPROVED="Erik Hanson"