From 5914c494703427bb07b1cd88e2ee2606f6d5b6cb Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 11 Aug 2010 20:52:08 +0000 Subject: ChangeLogTag: Wed Aug 11 20:50:37 UTC 2010 Adam Mitz --- ACE/ChangeLog | 8 ++++++++ ACE/bin/MakeProjectCreator/templates/gnu.mpd | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ad550092d7d..ed040bc37ed 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 11 20:50:37 UTC 2010 Adam Mitz + + * bin/MakeProjectCreator/templates/gnu.mpd: + + With ARCH set, we need to create the local ARCH directory for the + executable in case there are no object files that would otherwise + have required it. + Wed Aug 11 13:45:52 UTC 2010 Johnny Willemsen * ace/config-g++-common.h: 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 -- cgit v1.2.1