diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2011-04-25 13:37:00 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:45:18 +0200 |
| commit | 75a4a592e5ccda30715f93563d741b83e0dcf39e (patch) | |
| tree | 502f745607e77a2c4386ad38d818ddcafe81489c /source/x/x11-skel | |
| parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
| download | current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz | |
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!
Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
As always, thanks to the Slackware community for testing, suggestions,
and feedback. :-)
Have fun!
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 05e7fb0f..a2d2d8c6 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 b21b325c..cd8559b7 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" |