From 9c400bd0bb618dd501f5dd3c836135413b19402a Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Fri, 7 Dec 2007 10:11:47 +0000
Subject: * (bug 3460) Revert OS X uname change

git-svn-id: svn://svn.icculus.org/quake3/trunk@1228 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 04009a2..91c4047 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,15 @@
 
 COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
 
+COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/)
+
 ifeq ($(COMPILE_PLATFORM),sunos)
   # Solaris uname and GNU uname differ
-  COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
-else
-  COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
+  COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/)
+endif
+ifeq ($(COMPILE_PLATFORM),darwin)
+  # Apple does some things a little differently...
+  COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/)
 endif
 
 ifeq ($(COMPILE_PLATFORM),mingw32)
-- 
cgit v1.2.3