diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-07 16:31:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-07 16:31:02 +0000 |
| commit | 3ced0c4f888e5dda55b7b39967adf4dfc36486d6 (patch) | |
| tree | bb6e6bad06a9b06d4e423a5778ae289f0e295606 /odk/settings/settings.mk | |
| parent | 4a276d7407e27958ca2e1152e4034865fce8e1dd (diff) | |
INTEGRATION: CWS accanonical (1.10.6); FILE MERGED
2005/03/07 17:06:05 rene 1.10.6.10: RESYNC: (1.11-1.12); FILE MERGED
2005/02/11 04:21:44 vq 1.10.6.9: #i39684# One $(PRJ)/ was missing ...
2005/02/05 15:25:34 rene 1.10.6.8: use $(PRJ) instead of ..
2005/02/01 22:48:27 rene 1.10.6.7: commit
2005/02/01 18:35:59 rene 1.10.6.6: #i39684# remove uname from odk
2005/02/01 18:02:02 rene 1.10.6.5: RESYNC: (1.10-1.11); FILE MERGED
2005/01/28 05:31:51 vq 1.10.6.4: #i39684# Fix replacement of [SDKNAME] and clean-up settings.mk.
2005/01/24 16:44:50 rene 1.10.6.3: fix solaris ifneq
2005/01/21 11:44:44 rene 1.10.6.2: solaris has solarisx.y as platform, so use grep...
2005/01/21 10:35:45 rene 1.10.6.1: #i39684# remove uname from odk
Diffstat (limited to 'odk/settings/settings.mk')
| -rw-r--r-- | odk/settings/settings.mk | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index c78f2166e039..fb929510fcf6 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -2,30 +2,12 @@ # This file have to updated/extended for other platforms. # test for the platform -PLATFORM := $(shell uname -s) +PLATFORM := $(shell $(PRJ)/config.guess | cut -d"-" -f3,4) -# special check for windows because normally we have no uname under windows +# config.guess is missing for windows. We rely on getting "" in this case. ifeq "$(PLATFORM)" "" PLATFORM = windows endif -ifeq "$(PLATFORM)" "WINNT" -PLATFORM = windows -endif -ifeq "$(PLATFORM)" "WindowsNT" -PLATFORM = windows -endif -ifeq "$(PLATFORM)" "CYGWIN_NT-5.0" -PLATFORM = windows -endif -ifeq "$(PLATFORM)" "CYGWIN_NT-5.1" -PLATFORM = windows -endif -ifeq "$(PLATFORM)" "MINGW32_NT-5.0" -PLATFORM = windows -endif -ifeq "$(PLATFORM)" "MINGW32_NT-5.1" -PLATFORM = windows -endif # debug option, default is no debug DEBUG=no @@ -133,10 +115,10 @@ endif # Solaris specific settings # ########################################################################### -ifeq "$(PLATFORM)" "SunOS" +ifneq (,$(findstring solaris,$(PLATFORM))) # Settings for Solaris using Sun Workshop compiler -PROCTYPE := $(shell uname -p) +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) ifeq "$(PROCTYPE)" "sparc" PLATFORM=solsparc @@ -223,18 +205,18 @@ endif # Linux specific settings # ########################################################################### -ifeq "$(PLATFORM)" "Linux" +ifeq "$(PLATFORM)" "linux-gnu" # Settings for Linux using gcc compiler -PROCTYPE := $(shell uname -m) +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1) # Default is linux on a intel machine PLATFORM=linux PACKAGE_LIB_DIR=linux_x86.plt UNOPKG_PLATFORM=Linux_x86 JAVA_PROC_TYPE=i386 - -ifeq "$(PROCTYPE)" "ppc" + +ifeq "$(PROCTYPE)" "powerpc" PACKAGE_LIB_DIR=linux_powerpc.plt UNOPKG_PLATFORM=Linux_PowerPC JAVA_PROC_TYPE=ppc @@ -330,7 +312,7 @@ endif # MacOSX/Darwin specific settings # ########################################################################### -ifeq "$(PLATFORM)" "Darwin" +ifeq "$(PLATFORM)" "darwin" # Settings for MacOSX using gcc 3.3 compiler # Default is MacOSX on a ppc machine @@ -415,10 +397,10 @@ endif # FreeBSD specific settings # ########################################################################### -ifeq "$(PLATFORM)" "FreeBSD" +ifeq "$(PLATFORM)" "freebsd" # Settings for FreeBSD using gcc compiler -PROCTYPE := $(shell uname -m) +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) # Default is freebsd on a intel machine PLATFORM=FreeBSD |