diff options
| -rw-r--r-- | libraries/plib/plib.SlackBuild | 19 | ||||
| -rw-r--r-- | libraries/plib/plib.info | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/libraries/plib/plib.SlackBuild b/libraries/plib/plib.SlackBuild index 15235e477b..1e70471054 100644 --- a/libraries/plib/plib.SlackBuild +++ b/libraries/plib/plib.SlackBuild @@ -17,10 +17,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 @@ -42,16 +45,20 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man + --mandir=/usr/man \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) ( cd $PKG/usr/man @@ -60,13 +67,13 @@ make install DESTDIR=$PKG ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS INSTALL README NEWS NOTICE KNOWN_BUGS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS INSTALL README NEWS NOTICE KNOWN_BUGS \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install 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 - diff --git a/libraries/plib/plib.info b/libraries/plib/plib.info index 9c7cffc9d7..d3b0908273 100644 --- a/libraries/plib/plib.info +++ b/libraries/plib/plib.info @@ -5,4 +5,4 @@ DOWNLOAD="http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz" MD5SUM="47a6fbf63668c1eed631024038b2ea90" MAINTAINER="x-ip" EMAIL="edvm@rcom.com.ar" -APPROVED="David Somero" +APPROVED="dsomero,rworkman" |