diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:01:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:01:15 +0000 |
| commit | 9b21946413e6650747b1532b855a9e671106527f (patch) | |
| tree | e67fd843a9c8c51754b8ba2cbfec7d3c3ca939ed | |
| parent | 646f9dcbf4ca4c9b7e581fa70033c8dd5b9678c4 (diff) | |
INTEGRATION: CWS dmake43p01 (1.3.2); FILE MERGED
2006/02/03 19:46:31 vq 1.3.2.2: #i61170# Let $(TMD)/somedir always be a valid path.
Adjust the dmake bootstrap makefile to this change.
2005/04/07 22:30:57 vq 1.3.2.1: Issue number: 43241
Submitted by: shay@openoffice.org
Allow dmake to be build on windows without 4NT.
| -rw-r--r-- | dmake/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dmake/makefile.mk b/dmake/makefile.mk index 509d28675c49..7785ee30fda6 100644 --- a/dmake/makefile.mk +++ b/dmake/makefile.mk @@ -79,11 +79,11 @@ $(TARGET) : $(OBJECTS);$(LD) $(LDARGS) # Use this for install targets .IF $(SHELL) == mpw - $(MKCONFIG) : template.mk +$(MKCONFIG) : template.mk duplicate :$(<:s,/,:,) $@ .ELSE - $(MKCONFIG) : template.mk - $(eq,$(SHELL),$(COMSPEC) +copy cp) $< $@ +$(MKCONFIG) : template.mk + $(eq,$(SHELL),$(COMSPEC) +copy cp) $< $(eq,$(SHELL),$(COMSPEC) $(@:s,/,\,) $@) .ENDIF # how to make public.h @@ -116,7 +116,7 @@ dmake.uue : dmake.p uuencode dmake.Z dmake.Z >dmake.uue /bin/rm -f dmake.Z -template.mk ".SETDIR=$(ENVDIR)" .USESHELL .MKDIR : $$(TMD)startup/template.mk +template.mk ".SETDIR=$(ENVDIR)" .USESHELL .MKDIR : $$(TMD)/startup/template.mk cat $< |\ sed -e 's/xxOSxx/$(OS)/' |\ sed -e 's/xxOSRELEASExx/$(OSRELEASE)/' |\ |