4 files changed, 12 insertions, 5 deletions
diff --git a/network/suphp/config/mod_suphp.conf b/network/suphp/config/mod_suphp.conf
index 60d6d157f2..4f63db0ec4 100644
--- a/network/suphp/config/mod_suphp.conf
+++ b/network/suphp/config/mod_suphp.conf
@@ -3,7 +3,7 @@
 # ===========================
 
 # Invite this baby in.
-LoadModule suphp_module /usr/lib/httpd/modules/mod_suphp.so
+LoadModule suphp_module @LIBDIR@/httpd/modules/mod_suphp.so
 
 # Tell her what maybe on the menu here.
 AddHandler x-httpd-php .php .php3 .php4 .php5
diff --git a/network/suphp/config/suphp.conf b/network/suphp/config/suphp.conf
index b973e9f97e..1a2295dd0d 100644
--- a/network/suphp/config/suphp.conf
+++ b/network/suphp/config/suphp.conf
@@ -7,7 +7,7 @@ logfile=/var/log/httpd/suphp_log
 loglevel=info
 
 ; User Apache is running as
-webserver_user=apache
+webserver_user=@HTTPD_USER@
 
 ; Path all scripts have to be in
 ; This should reflect the vhosts DocumentRoot
diff --git a/network/suphp/suphp.SlackBuild b/network/suphp/suphp.SlackBuild
index e3e9eff0cc..a675d9af10 100644
--- a/network/suphp/suphp.SlackBuild
+++ b/network/suphp/suphp.SlackBuild
@@ -30,10 +30,13 @@ HTTPD_GROUP=${HTTPD_GROUP:-apache}
 
 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 # Exit on most errors
@@ -58,6 +61,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-apr=/usr/bin/apr-1-config \
   --with-apxs=/usr/sbin/apxs \
   --sysconfdir=/etc/httpd \
@@ -81,10 +85,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 mkdir -p $PKG/etc/httpd
-cat $CWD/config/mod_suphp.conf > $PKG/etc/httpd/mod_suphp.conf.new
+sed "s%@LIBDIR@%/usr/lib${LIBDIRSUFFIX}%" $CWD/config/mod_suphp.conf > \
+  $PKG/etc/httpd/mod_suphp.conf.new
 
 # Make sure the user Apache runs as in correctly reflected
-sed s/'webserver_user=apache'/"webserver_user=$HTTPD_USER"/g \
+sed "s/@HTTPD_USER@/$HTTPD_USER/" \
   $CWD/config/suphp.conf > $PKG/etc/httpd/suphp.conf.new
 
 mkdir -p $PKG/install
@@ -107,4 +112,4 @@ else
 fi
 
 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}
diff --git a/network/suphp/suphp.info b/network/suphp/suphp.info
index f5ff3e4d3f..4396f2225f 100644
--- a/network/suphp/suphp.info
+++ b/network/suphp/suphp.info
@@ -3,6 +3,8 @@ VERSION="0.7.1"
 HOMEPAGE="http://www.suphp.org/"
 DOWNLOAD="http://www.suphp.org/download/suphp-0.7.1.tar.gz"
 MD5SUM="c172dd4f15a75f4dcb08ea97d4202bb8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
 APPROVED="rworkman"