diff options
Diffstat (limited to 'libraries/commoncpp2/commoncpp2.SlackBuild')
| -rw-r--r-- | libraries/commoncpp2/commoncpp2.SlackBuild | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libraries/commoncpp2/commoncpp2.SlackBuild b/libraries/commoncpp2/commoncpp2.SlackBuild index 8f4c5f8764..93d9db0a9c 100644 --- a/libraries/commoncpp2/commoncpp2.SlackBuild +++ b/libraries/commoncpp2/commoncpp2.SlackBuild @@ -35,10 +35,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 @@ -73,6 +76,7 @@ CFLAGS="$SLKCFLAGS -I." \ CXXFLAGS="$SLKCFLAGS -I." \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --infodir=/usr/info \ @@ -89,7 +93,7 @@ make install DESTDIR=$PKG mv doc/man $PKG/usr # Remove static libraries -rm $PKG/usr/lib/*a +rm $PKG/usr/lib${LIBDIRSUFFIX}/*a ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ @@ -121,4 +125,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} |