From 1446346432d489763ff85734b20ae066cd65f2ce Mon Sep 17 00:00:00 2001
From: Juergen Schmidt <jsc@openoffice.org>
Date: Thu, 27 Jan 2011 13:33:00 +0100
Subject: jsc340: extend proctype check for MacOS

---
 odk/settings/settings.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'odk')

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index ca35652d1cd3..af9b1536df9b 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -387,12 +387,12 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
 # Default is MacOSX on a Intel machine    
 PLATFORM=macosx
 
-ifeq "$(PROCTYPE)" "i686"
+ifeq "$(PROCTYPE)" "i386"
 PACKAGE_LIB_DIR=macosx_x86.plt
 UNOPKG_PLATFORM=MacOSX_x86
 JAVA_PROC_TYPE=x86
 else
-ifeq "$(PROCTYPE)" "i386"
+ifeq "$(PROCTYPE)" "x86_64"
 PACKAGE_LIB_DIR=macosx_x86.plt
 UNOPKG_PLATFORM=MacOSX_x86
 JAVA_PROC_TYPE=x86
-- 
cgit