summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libdiscid/libdiscid.SlackBuild8
-rw-r--r--libraries/libdiscid/libdiscid.info2
-rw-r--r--libraries/libdiscid/slack-desc6
3 files changed, 11 insertions, 5 deletions
diff --git a/libraries/libdiscid/libdiscid.SlackBuild b/libraries/libdiscid/libdiscid.SlackBuild
index 988b322155..2de2654e6b 100644
--- a/libraries/libdiscid/libdiscid.SlackBuild
+++ b/libraries/libdiscid/libdiscid.SlackBuild
@@ -33,10 +33,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -58,6 +61,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-static \
--build=$ARCH-slackware-linux
@@ -75,11 +79,11 @@ make install DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
AUTHORS COPYING ChangeLog README \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $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}
diff --git a/libraries/libdiscid/libdiscid.info b/libraries/libdiscid/libdiscid.info
index b3281950de..80e69849ec 100644
--- a/libraries/libdiscid/libdiscid.info
+++ b/libraries/libdiscid/libdiscid.info
@@ -2,7 +2,9 @@ PRGNAM="libdiscid"
VERSION="0.2.2"
HOMEPAGE="http://musicbrainz.org/doc/libdiscid"
DOWNLOAD="http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz"
+DOWNLOAD_x86_64=""
MD5SUM="ee21ddbe696a3c60e14827a75f3bcf5b"
+MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="Erik Hanson"
diff --git a/libraries/libdiscid/slack-desc b/libraries/libdiscid/slack-desc
index 4a950b62cc..8b988f5437 100644
--- a/libraries/libdiscid/slack-desc
+++ b/libraries/libdiscid/slack-desc
@@ -13,7 +13,7 @@ libdiscid: audio CDs. It reads a CD's table of contents (TOC) and generates
libdiscid: an identifier which can be used to lookup the CD at MusicBrainz.
libdiscid: Additionally, it provides a submission URL for adding the DiscID
libdiscid: to the database.
-libdiscid:
+libdiscid:
libdiscid: Homepage: http://musicbrainz.org/doc/libdiscid
-libdiscid:
-libdiscid:
+libdiscid:
+libdiscid: