From 74355de7789b5d5587c6ce30b33ad3b0d2d6af58 Mon Sep 17 00:00:00 2001
From: Menno Duursma <druiloor@zonnet.nl>
Date: Thu, 13 May 2010 00:38:24 +0200
Subject: network/suphp: Updated for version 0.7.1
---
network/suphp/suphp.SlackBuild | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'network/suphp/suphp.SlackBuild')
diff --git a/network/suphp/suphp.SlackBuild b/network/suphp/suphp.SlackBuild
index e3e9eff0cca24..a675d9af10bf6 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}
--
cgit v1.2.3