2 files changed, 24 insertions, 5 deletions
diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild
index f8e55326be11..7e3e73c26116 100644
--- a/network/nagios/nagios.SlackBuild
+++ b/network/nagios/nagios.SlackBuild
@@ -4,16 +4,29 @@
 # IT infrastructure monitoring system
 
 # Written by Niels Horn - niels.horn@gmail.com
-# revision date 2010/03/11
+# revision date 2010/07/10
 
 PRGNAM=nagios
 VERSION=${VERSION:-3.2.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
+
 DOCROOT=${DOCROOT:-/var/www/htdocs}
 
+# To create valid symlinks, we need a relative path from DOCROOT
+RELPATH=""
+for i in $(echo $DOCROOT | tr "/" " "); do
+  RELPATH="${RELPATH}../"
+done
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -35,6 +48,10 @@ elif [ "$ARCH" = "arm" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
   ARCHQUADLET="-gnueabi"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  ARCHQUADLET=""
 fi
 
 set -e
@@ -102,7 +119,9 @@ cp -a \
   Changelog INSTALLING LEGAL LICENSE README THANKS UPGRADING contrib \
     $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/$DOCROOT/$PRGNAM/docs $PKG/usr/doc/$PRGNAM-$VERSION/html
-( cd $PKG/$DOCROOT/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION/html docs )
+cd $PKG/$DOCROOT/$PRGNAM
+  ln -sf ../$RELPATH/usr/doc/$PRGNAM-$VERSION/html docs
+cd -
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
diff --git a/network/nagios/nagios.info b/network/nagios/nagios.info
index 05085771b619..08c9299fe772 100644
--- a/network/nagios/nagios.info
+++ b/network/nagios/nagios.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"