diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 15:04:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 15:04:59 +0000 |
| commit | 9695384c707485aa97e96414d22fbe513605e28d (patch) | |
| tree | 1fb36b6b816bd5d2898fa8de168645ed1b738b26 /moz | |
| parent | ceb7b40912b63a40dd248e0d14c4d4a0f4567bca (diff) | |
INTEGRATION: CWS execshellmacrogone (1.12.12); FILE MERGED
2007/10/24 06:35:42 rene 1.12.12.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 638291553259..86613416f725 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2007-05-25 11:37:09 $ +# last change: $Author: rt $ $Date: 2007-11-06 16:04:59 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -180,11 +180,11 @@ CXX:=cl.exe MOZTOOLSUNPACK:=$(MISC)$/build$/moztoolsunpack MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst .IF "$(USE_SHELL)"!="4nt" -MOZ_TOOLS_DOS:=$(shell cygpath -ad "$(MISC)")\build\moztoolsinst +MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztoolsinst .IF "$(COM)"=="GCC" -PATH!:=$(PATH):$(shell cygpath $(MOZ_TOOLS_DOS))/bin:$(shell cygpath $(MOZ_TOOLS_DOS))/vc71/bin +PATH!:=$(PATH):$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin .ELSE -PATH!:=$(shell cygpath $(MOZ_TOOLS_DOS))/vc71/bin:$(shell cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH) +PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH) .ENDIF .IF "$(USE_SHELL)"=="tcsh" SET_MOZ_TOOLS_INSTALL_BAT:=setenv MOZ_TOOLS "$(MOZ_TOOLS_DOS)" @@ -195,7 +195,7 @@ SET_MOZ_TOOLS_INSTALL_BAT:=MOZ_TOOLS="$(MOZ_TOOLS_DOS)"; export MOZ_TOOLS .ENDIF .ELSE # "$(USE_SHELL)"!="4nt" # MOZ_TOOLS must contain an absolute path -MOZ_TOOLS_DOS:=$(shell echo %@SFN[$(MISC)])\build\moztoolsinst +MOZ_TOOLS_DOS:=$(shell @echo %@SFN[$(MISC)])\build\moztoolsinst PATH!:=$(MOZ_TOOLS_DOS)\vc71\bin;$(MOZ_TOOLS_DOS)\bin;$(PATH) SET_MOZ_TOOLS_INSTALL_BAT:=set MOZ_TOOLS=$(MOZ_TOOLS_DOS) .ENDIF # "$(USE_SHELL)"!="4nt" |