diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:13:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:13:11 +0000 |
| commit | 8973c01770153c06a13af82f45b425fc1138140d (patch) | |
| tree | f47df496fbd4abd997f6b0c90f7a5f73e668a069 /dmake/startup | |
| parent | ae0c4d4fe02210912a4ee9c20d99565dec5c1876 (diff) | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/09 21:22:33 vq 1.1.1.1.132.2: #i43254# Make the usage of DMAKEROOT consistent with the man page for
all OSs. This includes the removal of "SOLARVER UPD INPATH OS UPDMINOREXT"
from the list of macros that are always imported from the environment.
Patch inspired in part by shay@openoffice.org.
2005/04/08 15:26:21 vq 1.1.1.1.132.1: Issue number: 47004
Submitted by: shay@openoffice
Fix syntax errors (warnings) in subst macros.
Diffstat (limited to 'dmake/startup')
| -rw-r--r-- | dmake/startup/win95/macros.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dmake/startup/win95/macros.mk b/dmake/startup/win95/macros.mk index 72707c23bbe3..992d69ea3625 100644 --- a/dmake/startup/win95/macros.mk +++ b/dmake/startup/win95/macros.mk @@ -4,7 +4,7 @@ # Execution environment configuration. # Grab the current setting of COMSPEC. # -.IMPORT .IGNORE : COMSPEC +.IMPORT .IGNORE : COMSPEC ROOTDIR # First check if SHELL is defined to be something other than COMSPEC. # If it is, then assume that SHELL is a Korn compatible shell like MKS's @@ -37,7 +37,7 @@ V *:= # RCS suffix GROUPFLAGS *:= $(SHELLFLAGS) SHELLMETAS *:= "<>| GROUPSUFFIX *:= .bat - DIVFILE *= $(TMPFILE:s,/,\) + DIVFILE *= $(TMPFILE:s,/,\,) RM *= del RMFLAGS *= MV *= rename @@ -54,7 +54,7 @@ V *:= # RCS suffix RM *= $(ROOTDIR)$/bin$/rm RMFLAGS *= -f MV *= $(ROOTDIR)$/bin$/mv - DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}}) + DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},) __.DIVSEP-sh-yes *:= \\\ __.DIVSEP-sh-no *:= \\ .ENDIF |