diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2004-11-10 16:38:21 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2004-11-10 16:38:21 +0000 |
| commit | 73af0436c311b6278bbb09d6eb97523c94d3ce9c (patch) | |
| tree | 7d3c4e6ae457735a037855f8e858621a0f5f1e8f | |
| parent | 126ea65ba8cda15344842b76bd983bedbff10741 (diff) | |
| download | ATCD-73af0436c311b6278bbb09d6eb97523c94d3ce9c.tar.gz | |
ChangeLogTag: Wed Nov 10 16:35:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 2 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 12 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 7 |
4 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 751a7e1994a..f403477656a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Nov 10 16:35:12 UTC 2004 Martin Corino <mcorino@remedy.nl> + + * bin/MakeProjectCreator/templates/gnu.mpd: + * include/makeinclude/rules.local.GNU: + * include/makeinclude/wrapper_macros.GNU: + Introduced use of ACE_MKDIR and MKDIR variables to better support + VxWorks 5.5.1 builds. + Wed Nov 10 07:10:12 2004 Chad Elliott <elliott_c@ociweb.com> * ASNMP/asnmp/enttraps.h: diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index bea8e4183c8..b11bfea684b 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -133,7 +133,7 @@ ifneq ($(OUTPUT_DIRECTORY),) all: $(OUTPUT_DIRECTORY) $(OUTPUT_DIRECTORY): - -@mkdir -p "$(OUTPUT_DIRECTORY)" + -@$(MKDIR) "$(OUTPUT_DIRECTORY)" endif <%if(sharedname || staticname || exename)%> diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 150b06bbf9d..8eeebc0c38d 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -161,23 +161,23 @@ endif # SOLINK ifeq ($(vxworks_ntbuild),1) $(VDIR)%.creation_stamp: - @if not exist $(dir $@) mkdir $(subst /,,$(dir $@)) + @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) @echo > $@ else .PHONY: $(VDIR)%.creation_stamp $(VDIR)%.creation_stamp: - @-test -d $(dir $@) || mkdir -p $(dir $@) $(ACE_NUL_STDERR) + @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) endif ifneq ($(VDIR),$(VSHDIR)) ifeq ($(vxworks_ntbuild),1) $(VSHDIR)%.creation_stamp: - @if not exist $(dir $@) mkdir $(subst /,,$(dir $@)) + @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) @echo > $@ else .PHONY: $(VSHDIR)%.creation_stamp $(VSHDIR)%.creation_stamp: - @-test -d $(dir $@) || mkdir -p $(dir $@) $(ACE_NUL_STDERR) + @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) endif endif @@ -449,10 +449,10 @@ build.objdirs: $(CLEANUP_DIRS) ifeq ($(MKDIR_NTSTYLE),1) $(CLEANUP_DIRS): - @if not exist $@ mkdir $@ + @if not exist $@ $(MKDIR) $@ $(ACE_NUL_STDERR) else $(CLEANUP_DIRS): - @test -d $@ || mkdir -p $@ $(ACE_NUL_STDERR) + @test -d $@ || $(MKDIR) $@ $(ACE_NUL_STDERR) endif #--------------------------------------------------------------------------- diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index ec04efbf4d4..fadb71ec99f 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -170,6 +170,7 @@ # PWD Command to get the current working directory # PTDIRS Pathnames of directories containing template code # RM Name of program to use to remove files +# ACE_MKDIR Name of program to (recursively) create directories # SOFLAGS Flags used to build a shared library # SOLINK.cc Link line necessary to build a share library # VAR Variant identifier suffix @@ -309,6 +310,12 @@ ifeq ($(PWD),) PWD=$(shell pwd) endif +ifeq ($(ACE_MKDIR),) + MKDIR = mkdir -p +else + MKDIR = $(ACE_MKDIR) +endif + #---------------------------------------------------------------------------- # Platform-independent macro definitions #---------------------------------------------------------------------------- |