diff options
| -rw-r--r-- | libraries/confuse/confuse.SlackBuild | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libraries/confuse/confuse.SlackBuild b/libraries/confuse/confuse.SlackBuild index aea93c1474953..43d21070fb022 100644 --- a/libraries/confuse/confuse.SlackBuild +++ b/libraries/confuse/confuse.SlackBuild @@ -9,6 +9,7 @@ VERSION=2.6 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -16,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 rm -rf $PKG @@ -31,22 +35,24 @@ cd $PRGNAM-$VERSION || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . -CFLAGS="$SLKCFLAGS" \ +# The "-Wno-unused" is needed on 13.0, but won't hurt anything for 12.2 +CFLAGS="-Wno-unused $SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-shared=yes \ --enable-static=no \ --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux \ || exit 1 make || exit 1 make install-strip DESTDIR=$PKG || exit 1 ( cd $PKG - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mkdir -p $PKG/usr/man/man3 @@ -56,7 +62,9 @@ gzip -9 $PKG/usr/man/man3/* rmdir $PKG/usr/bin mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + ABOUT-NLS AUTHORS COPYING INSTALL NEWS README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |