development/ipython: Miscellaneous cleanups.

1 files changed, 13 insertions, 24 deletions

diff --git a/development/ipython/ipython.SlackBuild b/development/ipython/ipython.SlackBuild
index 66f304fad6db..d1ff80ae46fa 100644
--- a/development/ipython/ipython.SlackBuild
+++ b/development/ipython/ipython.SlackBuild
@@ -24,10 +24,19 @@
 
 PKGNAM=ipython
 VERSION=${VERSION:-0.10}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PKGNAM
@@ -57,31 +66,11 @@ python setup.py \
 # Install documentation:
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/ipython $PKG/usr/doc/ipython-$VERSION
-chmod -R 644 $PKG/usr/doc/$PKGNAM-$VERSION/*
+chmod -R 0644 $PKG/usr/doc/$PKGNAM-$VERSION/*
 
-# Compress and link manpages, if any:
 mv $PKG/usr/share/man $PKG/usr
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# Compress info files, if any:
-if [ -d $PKG/usr/info ]; then
-  ( cd $PKG/usr/info
-    rm -f dir
-    gzip -9 *
-  )
-fi
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Delete now empty directory
 rm -rf $PKG/usr/share