summaryrefslogtreecommitdiffstats
path: root/desktop/wmCalClock/wmCalClock.SlackBuild
diff options
context:
space:
mode:
author Cezary M. Kruk <c.kruk@bigfoot.com>2010-05-13 00:23:18 +0200
committer Robby Workman <rworkman@slackbuilds.org>2010-05-13 00:23:18 +0200
commit8dd5bf1dd3b57f1c74be0826c4db74d8bb98cf2b (patch)
tree3a18be76dd4ed813db7a0de613a3daec4160f153 /desktop/wmCalClock/wmCalClock.SlackBuild
parentcad782849c0024e83f74e4ed6952d9dbc7a087e6 (diff)
downloadslackbuilds-8dd5bf1dd3b57f1c74be0826c4db74d8bb98cf2b.tar.gz
slackbuilds-8dd5bf1dd3b57f1c74be0826c4db74d8bb98cf2b.tar.xz
desktop/wmCalClock: Updated for version 1.25
Diffstat (limited to 'desktop/wmCalClock/wmCalClock.SlackBuild')
-rw-r--r--desktop/wmCalClock/wmCalClock.SlackBuild22
1 files changed, 10 insertions, 12 deletions
diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild
index 8262bd90f0..d1a912347a 100644
--- a/desktop/wmCalClock/wmCalClock.SlackBuild
+++ b/desktop/wmCalClock/wmCalClock.SlackBuild
@@ -18,10 +18,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
@@ -41,18 +44,14 @@ find . \
cd Src
- CFLAGS="$SLKCFLAGS" make
- mkdir $PKG/usr
- mkdir $PKG/bin
- mkdir -p $PKG/man/man1
- make install DESTDIR=$PKG
+ make \
+ CFLAGS="$SLKCFLAGS" \
+ INCDIR="-I/usr/include/X11" \
+ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
+ mkdir -p $PKG/usr/{bin,man/man1}
+ make install DESTDIR=$PKG/usr
cd -
-# Executable and manual are already installed;
-# we just move them to the correct location
-mv $PKG/bin $PKG/usr
-mv $PKG/man $PKG/usr
-
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
xargs strip --strip-unneeded 2> /dev/null || true
@@ -74,5 +73,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}