summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman2011-02-14 00:36:45 +0100
committer Robby Workman2011-02-28 16:42:03 +0100
commit806440bdde034ff5c7a56caee8ff5ec4b2c7f300 (patch)
treeb188ec82cb26cc2ed7151d446578130af6a5cf1d
parent49795dbaaccf9989cd61c1e876dc412fadfa30a0 (diff)
downloadslackbuilds-806440bdde034ff5c7a56caee8ff5ec4b2c7f300.tar.gz
network/mod_wsgi: Install config file in /etc/httpd/extra/
(instead of toplevel /etc/httpd/ directory) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--network/mod_wsgi/README2
-rw-r--r--network/mod_wsgi/mod_wsgi.SlackBuild15
2 files changed, 12 insertions, 5 deletions
diff --git a/network/mod_wsgi/README b/network/mod_wsgi/README
index fa3c2825c8..e2188db7ea 100644
--- a/network/mod_wsgi/README
+++ b/network/mod_wsgi/README
@@ -8,4 +8,4 @@ All major Python web frameworks/applications support mod_wsgi;
that means Django, Pylons, Turbogears, etcetera...
You'll need to add the following line to your /etc/httpd/httpd.conf file:
- Include /etc/httpd/mod_wsgi.conf
+ Include /etc/httpd/extra/mod_wsgi.conf
diff --git a/network/mod_wsgi/mod_wsgi.SlackBuild b/network/mod_wsgi/mod_wsgi.SlackBuild
index 208e6548f1..922ecc64fd 100644
--- a/network/mod_wsgi/mod_wsgi.SlackBuild
+++ b/network/mod_wsgi/mod_wsgi.SlackBuild
@@ -7,10 +7,17 @@
PRGNAM=mod_wsgi
VERSION=3.1
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -46,9 +53,9 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-mkdir -p $PKG/etc/httpd
+mkdir -p $PKG/etc/httpd/extra
sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%" $CWD/mod_wsgi.conf > \
- $PKG/etc/httpd/mod_wsgi.conf.new
+ $PKG/etc/httpd/extra/mod_wsgi.conf.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a LICENCE README $PKG/usr/doc/$PRGNAM-$VERSION/