diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-12 07:10:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-12 07:10:04 +0000 |
| commit | 6959c30cc239d0776b03f81513ad9fce1ce4ff14 (patch) | |
| tree | 56ccf319c0e1a99b49d5765f641270ef760d3eab /odk/settings | |
| parent | f938ef751b7ca126f09891759fafc88d7ad2a509 (diff) | |
#i83538# Undo changes from CWS execshellmacrogone.
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index c42e12821d8a..554153ebf879 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -2,7 +2,7 @@ # This file have to updated/extended for other platforms. # test for the platform -PLATFORM := $(shell @$(PRJ)/config.guess | cut -d"-" -f3,4) +PLATFORM := $(shell $(PRJ)/config.guess | cut -d"-" -f3,4) # config.guess is missing for windows. We rely on getting "" in this case. ifeq "$(PLATFORM)" "" @@ -128,7 +128,7 @@ endif ifneq (,$(findstring solaris,$(PLATFORM))) # Settings for Solaris using Sun Workshop compiler -PROCTYPE := $(shell @$(PRJ)/config.guess | cut -d"-" -f1) +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) ifeq "$(PROCTYPE)" "sparc" PLATFORM=solsparc @@ -222,7 +222,7 @@ endif ifeq "$(PLATFORM)" "linux-gnu" # Settings for Linux using gcc compiler -PROCTYPE := $(shell @$(PRJ)/config.guess | cut -d "-" -f1) +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1) # Default is linux on a intel machine PLATFORM=linux @@ -262,7 +262,7 @@ SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell @$(CC) -dumpversion) +GCC_VERSION=$(shell $(CC) -dumpversion) COMID=gcc3 CPPU_ENV=gcc3 @@ -360,7 +360,7 @@ SHAREDLIB_EXT=dylib SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell @$(CC) -dumpversion) +GCC_VERSION=$(shell $(CC) -dumpversion) COMID=gcc3 CPPU_ENV=gcc3 @@ -430,7 +430,7 @@ endif ifneq (,$(findstring freebsd,$(PLATFORM))) # Settings for FreeBSD using gcc compiler -PROCTYPE := $(shell @$(PRJ)/config.guess | cut -d"-" -f1) +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) # Default is freebsd on a intel machine PLATFORM=freebsd @@ -451,9 +451,9 @@ SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell @$(CC) -dumpversion) +GCC_VERSION=$(shell $(CC) -dumpversion) -ifeq "$(shell @echo $(GCC_VERSION) | cut -c 1)" "3" +ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" COMID=gcc3 CPPU_ENV=gcc3 else |