summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libdockapp/libdockapp.SlackBuild9
-rw-r--r--libraries/libdockapp/libdockapp.info2
2 files changed, 9 insertions, 2 deletions
diff --git a/libraries/libdockapp/libdockapp.SlackBuild b/libraries/libdockapp/libdockapp.SlackBuild
index 732e2575cc..dfce31e317 100644
--- a/libraries/libdockapp/libdockapp.SlackBuild
+++ b/libraries/libdockapp/libdockapp.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
@@ -45,13 +48,15 @@ patch -p1 < $CWD/Fixup-examples-sharedir.patch
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--disable-debug \
--build=$ARCH-slackware-linux
-make install DESTDIR=$PKG
+make XFONTDIR="\$(DESTDIR)/usr/share/fonts"
+make install DESTDIR=$PKG XFONTDIR="\$(DESTDIR)/usr/share/fonts"
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -69,5 +74,5 @@ 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/libraries/libdockapp/libdockapp.info b/libraries/libdockapp/libdockapp.info
index 51da225026..7d6747478a 100644
--- a/libraries/libdockapp/libdockapp.info
+++ b/libraries/libdockapp/libdockapp.info
@@ -3,6 +3,8 @@ VERSION="0.6.2"
HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
DOWNLOAD="http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/libdockapp-0.6.2.tar.bz2"
MD5SUM="05a9a5f295d956397e6bb53bad3a0322"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Cezary M. Kruk"
EMAIL="c.kruk@bigfoot.com"
APPROVED="rworkman"