diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 07:54:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 07:54:13 +0000 |
| commit | 202d07e2fff4b1f374e2554b0d8e2a11e860283a (patch) | |
| tree | cf8fd58a45e151d330a3220ad03e5be30b848f46 /moz | |
| parent | #100000# temporary replace hedabu with hedabu_obsolete (diff) | |
| download | core-202d07e2fff4b1f374e2554b0d8e2a11e860283a.tar.gz core-202d07e2fff4b1f374e2554b0d8e2a11e860283a.zip | |
INTEGRATION: CWS vq36 (1.7.10); FILE MERGED
2007/03/29 18:16:18 vq 1.7.10.3: RESYNC: (1.9-1.10); FILE MERGED
2007/01/28 05:13:10 vq 1.7.10.2: RESYNC: (1.7-1.9); FILE MERGED
2006/08/27 03:23:31 vq 1.7.10.1: #i68937# Patch to build moz with W32-bash.
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 6895a7439fa4..12d04618245a 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2007-03-26 13:53:44 $ +# last change: $Author: ihi $ $Date: 2007-04-17 08:54:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -103,7 +103,7 @@ MOZILLA_CONFIGURE_FLAGS= $(SYSBASE_X11) --disable-tests \ --without-system-zlib \ --disable-installer \ --disable-accessibility \ - --disable-xpfe-components \ + --disable-xpfe-components \ --disable-mathml \ --disable-oji \ --disable-profilesharing \ @@ -165,8 +165,8 @@ SYSTEM_JPEG:= # For W32-tcsh CC and CXX must not contain the wrapper, and W32-4nt ( in # some cases ) doesn't work with DOS path notation when building mozilla. .IF "$(COM)"=="GCC" -CC:=$(CC:s/guw.pl //:s/ -mno-cygwin//) -CXX:=$(CXX:s/guw.pl //:s/ -mno-cygwin//) +CC:=$(CC:s/guw.exe //:s/ -mno-cygwin//) +CXX:=$(CXX:s/guw.exe //:s/ -mno-cygwin//) CPP:=$(CC) -E LD:=ld LIBS:=-lsupc++ @@ -186,7 +186,11 @@ PATH!:=$(PATH):$(shell cygpath $(MOZ_TOOLS_DOS))/bin:$(shell cygpath $(MOZ_TOOLS .ELSE 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)" +.ELSE +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 |