diff --git a/libraries/libnids/libnids.SlackBuild b/libraries/libnids/libnids.SlackBuild index a973a658de..534ec8f45c 100644 --- a/libraries/libnids/libnids.SlackBuild +++ b/libraries/libnids/libnids.SlackBuild @@ -26,22 +26,24 @@ PRGNAM=libnids VERSION=${VERSION:-1.23} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} - -DOCS="COPYING CREDITS README" +DOCS="CHANGES MISC README COPYING CREDITS doc/*" 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 @@ -63,6 +65,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-shared \ --build=$ARCH-slackware-linux @@ -89,4 +92,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} diff --git a/libraries/libnids/libnids.info b/libraries/libnids/libnids.info index 7eb957a634..4cacebae3f 100644 --- a/libraries/libnids/libnids.info +++ b/libraries/libnids/libnids.info @@ -1,8 +1,10 @@ PRGNAM="libnids" VERSION="1.23" HOMEPAGE="http://libnids.sourceforge.net/" -DOWNLOAD="http://prdownloads.sourceforge.net/libnids/libnids-1.23.tar.gz?download" +DOWNLOAD="http://downloads.sourceforge.net/libnids/libnids-1.23.tar.gz" MD5SUM="af35e8ef403a0ca95df2da94db856428" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Marco Bonetti" EMAIL="sid77@slackware.it" -APPROVED="rworkman" +APPROVED="michiel"