diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-18 14:37:30 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-18 14:37:30 -0500 |
| commit | 1e4ab67569d239c5982c4d2ecabac95ce4ec3a15 (patch) | |
| tree | 1920e94f284f61b8d1d2932936e1632e1666be4c | |
| parent | 71f4e14e12a494cf327c4e35f0e4cea59606b01b (diff) | |
| download | slackbuilds-1e4ab67569d239c5982c4d2ecabac95ce4ec3a15.tar.gz | |
system/gdm: Miscellaneous script cleanup.
| -rw-r--r-- | system/gdm/gdm.SlackBuild | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild index aa18408377..0b1d4460e4 100644 --- a/system/gdm/gdm.SlackBuild +++ b/system/gdm/gdm.SlackBuild @@ -10,10 +10,19 @@ PRGNAM=gdm VERSION=${VERSION:-2.20.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-$PRGNAM @@ -28,6 +37,10 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + fi set -e @@ -75,10 +88,8 @@ patch -d $PKG -p1 < $CWD/make_xfce_default_session.diff # Let's not clobber the a custom config mv $PKG/etc/X11/gdm/custom.conf $PKG/etc/X11/gdm/custom.conf.new -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ |