aboutsummaryrefslogtreecommitdiff
path: root/misc/matchbox-common/matchbox-common.SlackBuild
diff options
context:
space:
mode:
authorDaniel de Kok <danieldk@pobox.com>2010-05-13 00:34:25 +0200
committerMichiel van Wessem <michiel@slackbuilds.org>2010-05-13 00:34:25 +0200
commitfd59855499f6eae79fa5683b4fa5ae1bb180c227 (patch)
tree9920dcf61f1991be682ba186cdf68ada3fe203a1 /misc/matchbox-common/matchbox-common.SlackBuild
parent49048ba3858efc93dab1a0822f1424cb89aaddc7 (diff)
misc/matchbox-common: Updated for version 0.9.1
Diffstat (limited to 'misc/matchbox-common/matchbox-common.SlackBuild')
-rw-r--r--misc/matchbox-common/matchbox-common.SlackBuild24
1 files changed, 16 insertions, 8 deletions
diff --git a/misc/matchbox-common/matchbox-common.SlackBuild b/misc/matchbox-common/matchbox-common.SlackBuild
index c0e5c74cf3fc3..39d5070512dd4 100644
--- a/misc/matchbox-common/matchbox-common.SlackBuild
+++ b/misc/matchbox-common/matchbox-common.SlackBuild
@@ -22,14 +22,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Exit on most errors
-set -e
-
PRGNAM=matchbox-common
VERSION=0.9.1
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -37,15 +35,22 @@ 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
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -54,22 +59,25 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-startup-notification \
--enable-dnotify \
- --enable-acpi-linux
+ --enable-acpi-linux \
+ --build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING ChangeLog INSTALL NEWS README \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
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}