3 files changed, 25 insertions, 4 deletions
diff --git a/libraries/xerces-c/README b/libraries/xerces-c/README
index 83ec9fb48d..5810e50f91 100644
--- a/libraries/xerces-c/README
+++ b/libraries/xerces-c/README
@@ -2,4 +2,4 @@ Xerces-C++ is a validating XML parser written in a
 portable subset of C++. Xerces-C++ makes it easy to
 give your application the ability to read and write XML
 data. A shared library is provided for parsing, generating,
-manipulating, and validating XML documents.
-\ No newline at end of file
+manipulating, and validating XML documents.
diff --git a/libraries/xerces-c/xerces-c.SlackBuild b/libraries/xerces-c/xerces-c.SlackBuild
index c4720ff651..c67f85d1ca 100644
--- a/libraries/xerces-c/xerces-c.SlackBuild
+++ b/libraries/xerces-c/xerces-c.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=xerces-c
 VERSION=2.8.0
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -37,10 +37,16 @@ SRCVER=$(echo $VERSION | tr . _)
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  BITS=32
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  BITS=32
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  BITS=64
 fi
 
 set -e
@@ -58,7 +64,17 @@ cd src/xercesc/
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   XERCESCROOT="$TMP/$PRGNAM-src_$SRCVER" \
-    ./runConfigure -p linux -c gcc -x g++ -m inmem -n socket -t native -r pthreads -P /usr
+    ./runConfigure \
+      -p linux \
+      -c gcc \
+      -x g++ \
+      -m inmem \
+      -n socket \
+      -t native \
+      -r pthreads \
+      -b $BITS \
+      -P /usr \
+      -C libdir=/usr/lib${LIBDIRSUFFIX}
 
 # I could not get this to compile with more than 1 job, XGizzmo
   XERCESCROOT="$TMP/$PRGNAM-src_$SRCVER" \
@@ -69,6 +85,11 @@ cd src/xercesc/
     make install DESTDIR=$PKG
 cd -
 
+# For now, it seems that the libdir flag is ignored, so...
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib64
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/libraries/xerces-c/xerces-c.info b/libraries/xerces-c/xerces-c.info
index ffe70772d3..d5402a0479 100644
--- a/libraries/xerces-c/xerces-c.info
+++ b/libraries/xerces-c/xerces-c.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://apache.mirrors.tds.net/xerces/c/2/sources/xerces-c-src_2_8_0.ta
 MD5SUM="5daf514b73f3e0de9e3fce704387c0d2"
 MAINTAINER="ppr:kut"
 EMAIL="HMWiesinger@gmx.at"
-APPROVED="David Somero"
+APPROVED="dsomero,rworkman"