summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorJuergen Schmidt <jsc@openoffice.org>2010-10-28 14:17:41 +0200
committerJuergen Schmidt <jsc@openoffice.org>2010-10-28 14:17:41 +0200
commit21f4435c7287ad6b32b2c4d225c1077719055ba1 (patch)
treedaa4bf42efe2140f024f65fd161f392f1f17724c /odk
parent6fd759253928734f48061c4c38e5a046dd6ca96e (diff)
jsc340: i115252: check arch for older Mac version
Diffstat (limited to 'odk')
-rw-r--r--odk/settings/settings.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index b21efe720aba..ca35652d1cd3 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -392,10 +392,16 @@ PACKAGE_LIB_DIR=macosx_x86.plt
UNOPKG_PLATFORM=MacOSX_x86
JAVA_PROC_TYPE=x86
else
+ifeq "$(PROCTYPE)" "i386"
+PACKAGE_LIB_DIR=macosx_x86.plt
+UNOPKG_PLATFORM=MacOSX_x86
+JAVA_PROC_TYPE=x86
+else
PACKAGE_LIB_DIR=macosx_ppc.plt
UNOPKG_PLATFORM=MacOSX_PowerPC
JAVA_PROC_TYPE=ppc
endif
+endif
JAVABIN=Commands
GCC_VERSION =$(shell gcc -dumpversion| cut -d"." -f1,2)