diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:36:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:36:01 +0000 |
| commit | 0a094474def6fb22c19e2672b7e9b93e861c8105 (patch) | |
| tree | c271f326ff7631ac88550e8bbc26776d74470c53 /solenv/inc/startup | |
| parent | 4c3356b65e2736ab7fed979c36c5f74136c9bb99 (diff) | |
INTEGRATION: CWS nowrapcmd1 (1.21.178); FILE MERGED
2007/11/30 20:44:22 vq 1.21.178.4: #i82202# Provide a GUWCMD macro to access the wrapper and hereby avoid
hardcoding its actual program name everywhere.
2007/11/30 20:22:38 vq 1.21.178.3: RESYNC: (1.21-1.22); FILE MERGED
2007/11/18 15:03:20 vq 1.21.178.2: #i82202# Remove NOWRAPCMD, use inverted WRAPCMD instead.
2007/10/07 16:28:20 vq 1.21.178.1: #i82202# Add needed NOWRAPCMD changes.
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index 98a8d208ff11..d12739658716 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -1,7 +1,19 @@ # Define additional MSDOS specific settings. # -# Execution environment configuration. +# --- Set Wrapper command --- +# Provide a macro that can be used to access the wrapper and to avoid +# hardcoding the program name everywhere +GUWCMD*=guw.exe + +# Do not use WRAPCMD for 4nt or unless --enable-wrapcmd is given +.IF "$(USE_SHELL)" != "4nt" && "$(FLIPCMD)" == "$(WRAPCMD)" +WRAPCMD_ENV*=$(WRAPCMD) -env +.ELSE + +.WINPATH !:= yes + +.ENDIF # Directory cache configuration. .DIRCACHE *:= no @@ -31,8 +43,7 @@ SHELL *:= $(COMSPEC) DIRSEPSTR := \\ # See iz61212 for the reason why PWD is overwritten PWD:=$(shell @echo %_cwd) -.EXPORT : PWD - + .ELSE # Non 4nt case .IF $(USE_SHELL) == bash @@ -55,10 +66,11 @@ SHELL *:= $(COMSPEC) __.DIVSEP-sh-yes *:= \\\ __.DIVSEP-sh-no *:= \\ DIRSEPSTR :=/ -.EXPORT : PWD .ENDIF +.EXPORT : GUWCMD PWD + .IF $(USE_SHELL) == 4nt my4ver:=$(shell @echo %_4ver) |