diff options
Diffstat (limited to 'ACE/bin/MakeProjectCreator/templates/gnu.mpd')
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 1a34af6f87d..2b23f310635 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -143,8 +143,12 @@ else endif <%endif%> endif +<%if(install)%> OUTPUT_DIRECTORY = $(if $(ARCH),$(if $(INSBIN),$(INSBIN)/$(ARCH)),$(INSBIN)) <%else%> +OUTPUT_DIRECTORY = $(if $(ARCH),./$(ARCH)) +<%endif%> +<%else%> <%if(dllout || libout)%> COLLAPSE_SLASHES = $(if $(findstring //,$(1)),$(call COLLAPSE_SLASHES,$(subst //,/,$(1))),$(1)) INSLIB ?= <%if(compares(vms_old_make, 1))%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%><%else%>$(call COLLAPSE_SLASHES,<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>)<%endif%> @@ -385,8 +389,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU <%if(exename)%> -ifneq ($(OUTPUT_DIRECTORY),) -ifneq ($(OUTPUT_DIRECTORY),.) +ifneq ($(INSBIN),) +ifneq ($(INSBIN),.) INSTALL = $(VBIN:%=$(INSBIN)/%) CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/$(if $(ARCH),$(ARCH)/)%$(VAR)$(EXEEXT)) endif |