summaryrefslogtreecommitdiff
path: root/makefiles/gmake/guess_env
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2011-10-16 11:31:30 +0200
committerAndreas Baumann <abaumann@yahoo.com>2011-10-16 11:31:30 +0200
commitff4417a0cc344eed56d5ddd42b2a4cfd69b17c43 (patch)
tree5ba2b065ac96e3113ebfcc3c2602445ad92b7a43 /makefiles/gmake/guess_env
parent61adb6a1ba66d0990ccc72b6a105797987c0a4f3 (diff)
downloadsqlitexx-ff4417a0cc344eed56d5ddd42b2a4cfd69b17c43.tar.gz
sqlitexx-ff4417a0cc344eed56d5ddd42b2a4cfd69b17c43.tar.bz2
fixed for Linux 3.0, fixed a gcc warning about an unused variable
Diffstat (limited to 'makefiles/gmake/guess_env')
-rwxr-xr-xmakefiles/gmake/guess_env5
1 files changed, 4 insertions, 1 deletions
diff --git a/makefiles/gmake/guess_env b/makefiles/gmake/guess_env
index 2e4f3de..136e21b 100755
--- a/makefiles/gmake/guess_env
+++ b/makefiles/gmake/guess_env
@@ -15,6 +15,9 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in
if test -f /etc/arch-release; then
LINUX_DIST='arch'
LINUX_REV='current'
+ if test "$OS_MAJOR_VERSION" = "3"; then
+ OS_MINOR_VERSION=`echo $UNAME_RELEASE | cut -d . -f 2 | cut -d - -f 1`
+ fi
elif test -f /etc/debian_version; then
LINUX_DIST='debian'
LINUX_REV=`cat /etc/debian_version | cut -d . -f 1`
@@ -67,7 +70,7 @@ esac
case "$UNAME_MACHINE" in
i*86*) ARCH=x86
;;
- x86_64) ARCH=x86_64
+ x86_64|amd64) ARCH=x86_64
;;
sun4u) ARCH=sun4u
;;