diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2011-01-27 13:33:00 +0100 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2011-01-27 13:33:00 +0100 |
| commit | 1446346432d489763ff85734b20ae066cd65f2ce (patch) | |
| tree | b70fe392d518e1c5c3043621ee6b8a9109c3515c /odk | |
| parent | cd1471fbc30a7a4d598f2da731de2af71d522bea (diff) | |
jsc340: extend proctype check for MacOS
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/settings.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |