diff options
Diffstat (limited to 'source/x/x11-skel')
| -rw-r--r-- | source/x/x11-skel/doinst.sh | 2 | ||||
| -rwxr-xr-x | source/x/x11-skel/x11-skel.SlackBuild | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/source/x/x11-skel/doinst.sh b/source/x/x11-skel/doinst.sh index 05e7fb0fe..a2d2d8c61 100644 --- a/source/x/x11-skel/doinst.sh +++ b/source/x/x11-skel/doinst.sh @@ -15,7 +15,7 @@ # your /usr/X11R6 directory will be moved to /usr/X11R6.bak. # Anything you really want want to keep will need to be merged back # by hand. -if [ ! -L /usr/X11R6/bin ]; then +if [ ! -L usr/X11R6/bin ]; then if [ -d usr/X11R6 ]; then mv usr/X11R6 usr/X11R6.bak fi diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild index b21b325c9..cd8559b71 100755 --- a/source/x/x11-skel/x11-skel.SlackBuild +++ b/source/x/x11-skel/x11-skel.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,17 @@ VERSION=7.4 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +# 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 if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" |