diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:08:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:08:25 +0000 |
| commit | 725b90dafddc6208e99cf5246e6496ac3df036ec (patch) | |
| tree | a2eac2cbcb0f88ab2393f8cb79b9f9500deb3d30 /dmake/msdos | |
| parent | a1c7f0b9d8e45e7a97dbb643e225f4861eeb5193 (diff) | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/09 21:22:31 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:19 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/msdos')
| -rw-r--r-- | dmake/msdos/zortech/startup.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dmake/msdos/zortech/startup.mk b/dmake/msdos/zortech/startup.mk index 3c167a02e400..2697f738bb5b 100644 --- a/dmake/msdos/zortech/startup.mk +++ b/dmake/msdos/zortech/startup.mk @@ -22,8 +22,8 @@ S := .asm # Assembler sources V := # RCS suffix # See if these are defined -TMPDIR := $(ROOTDIR)/tmp -.IMPORT .IGNORE : TMPDIR SHELL COMSPEC +.IMPORT .IGNORE : TMPDIR SHELL COMSPEC ROOTDIR +TMPDIR *:= $(ROOTDIR)/tmp # Recipe execution configurations # First set SHELL, If it is not defined, use COMSPEC, otherwise @@ -46,14 +46,14 @@ GROUPSHELL := $(SHELL) SHELLMETAS := *"?<> GROUPSUFFIX := .bat DIRSEPSTR := \\\ - DIVFILE = $(TMPFILE:s,/,\) + DIVFILE = $(TMPFILE:s,/,\,) .ELSE SHELLFLAGS := -c GROUPFLAGS := SHELLMETAS := *"?<>|()&][$$\#`' GROUPSUFFIX := .ksh .MKSARGS := yes - DIVFILE = $(TMPFILE:s,/,${DIVSEP_shell_${USESHELL}}) + DIVFILE = $(TMPFILE:s,/,${DIVSEP_shell_${USESHELL}},) DIVSEP_shell_yes := \\\ DIVSEP_shell_no := \\ .END |