diff options
Diffstat (limited to 'modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd')
| -rw-r--r-- | modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd index ccb14d05cd3..399daf8c837 100644 --- a/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -124,7 +124,8 @@ PRJ_TYPE = library <%if(exename)%> <%if(install)%> -INSBIN ?= <%install%> +COLLAPSE_SLASHES = $(if $(findstring //,$(1)),$(call COLLAPSE_SLASHES,$(subst //,/,$(1))),$(1)) +INSBIN ?= $(call COLLAPSE_SLASHES,<%install%>) <%endif%> ifeq ($(INSBIN),.) ifeq ($(CURDIR),) @@ -145,7 +146,8 @@ endif OUTPUT_DIRECTORY = $(if $(ARCH),$(if $(INSBIN),$(INSBIN)/$(ARCH)),$(INSBIN)) <%else%> <%if(dllout || libout)%> -INSLIB ?= <%if(dllout)%><%dllout%><%else%><%libout%><%endif%> +COLLAPSE_SLASHES = $(if $(findstring //,$(1)),$(call COLLAPSE_SLASHES,$(subst //,/,$(1))),$(1)) +INSLIB ?= $(call COLLAPSE_SLASHES,<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>) <%endif%> ifeq ($(INSLIB),.) ifeq ($(CURDIR),) @@ -586,7 +588,7 @@ endif $(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%> <%endif%> <%endif%> - $(call ADD_QUOTE,$(call ADD_ARCH,<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>)) <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> $@<%else%><%custom_type->input_file%><%endif%> + $(if $(findstring ",<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>),<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>,$(call ADD_QUOTE,$(call ADD_ARCH,<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>))) <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> $@<%else%><%custom_type->input_file%><%endif%> <%if(flag_overrides(custom_type->input_file, postcommand))%> <%foreach(custom_type->input_file)%> <%flag_overrides(custom_type->input_file, postcommand)%> |