r1228 - trunk

[DONOTREPLY at icculus.org]

Author: tma
Date: 2007-12-07 05:11:47 -0500 (Fri, 07 Dec 2007)
New Revision: 1228

Modified:
   trunk/Makefile
Log:
* (bug 3460) Revert OS X uname change


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-12-04 06:55:16 UTC (rev 1227)
+++ trunk/Makefile	2007-12-07 10:11:47 UTC (rev 1228)
@@ -6,12 +6,16 @@
 
 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)
   ifeq ($(COMPILE_ARCH),i386)