From ba13ca371533f689d03ce2ee42820da6a9e9531a Mon Sep 17 00:00:00 2001
From: Iskar Enev <iskar.enev@gmail.com>
Date: Thu, 13 May 2010 00:32:15 +0200
Subject: libraries/libxml++: Updated for version 2.24.2

---
 libraries/libxml++/libxml++.SlackBuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'libraries/libxml++/libxml++.SlackBuild')

diff --git a/libraries/libxml++/libxml++.SlackBuild b/libraries/libxml++/libxml++.SlackBuild
index 831ad8e5e2..701eb5ddba 100644
--- a/libraries/libxml++/libxml++.SlackBuild
+++ b/libraries/libxml++/libxml++.SlackBuild
@@ -20,10 +20,13 @@ set -e
 
 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
@@ -44,6 +47,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --build=$ARCH-slackware-linux
@@ -52,8 +56,10 @@ 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
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -67,4 +73,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}
-- 
cgit v1.2.3-80-g2a13