diff options
Diffstat (limited to 'bin/MakeProjectCreator/templates')
| -rw-r--r-- | bin/MakeProjectCreator/templates/bor.mpd | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd index 4e1c101e100..10563c42392 100644 --- a/bin/MakeProjectCreator/templates/bor.mpd +++ b/bin/MakeProjectCreator/templates/bor.mpd @@ -143,10 +143,6 @@ realclean: customclean_<%custom_type%>_<%forcount(custom_type->input_files)%> # # Override defaults in outputdir.bor # -<%if(INSTALL_THIS_TARGET)%> -INSTALL_THIS_TARGET = 1 - -<%endif%> <%marker(macros)%> STATIC_DIR=. DEBUG_DIR=. @@ -177,10 +173,10 @@ BINDIR = <%libout%> !include <$(ACE_ROOT)\include\makeinclude\build_library.bor> <%endif%> -<%if(header_files || template_files || inline_files || idl_files || pidl_files)%> +<%if(header_files || template_files || inline_files || idl_files)%> includes_install: $(INCLUDES) -<%foreach(header_files template_files inline_files idl_files pidl_files)%> +<%foreach(header_files template_files inline_files idl_files)%> -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%dirname(header_file)%> mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%dirname(header_file)%> -© /Y <%header_file%> $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%header_file%> 1> NUL <%endfor%> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index d127c32620b..e024ed2824d 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -133,7 +133,7 @@ else ifeq ($(findstring k, $(MAKEFLAGS)),k) LIBCHECK = 1 else - LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>) + LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>) ifeq ($(LIBCHECK),) LIBCHECK = 1 endif @@ -257,7 +257,7 @@ ifeq ($(<%require%>),1) ifneq ($(<%avoid%>),1) <%endfor%> ifeq ($(LIBCHECK), 1) -BIN = $(BIN_UNCHECKED)$(EXEEXT) +BIN = $(BIN_UNCHECKED) else all: lib_warning endif @@ -290,8 +290,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU <%if(install && exename)%> ifneq ($(OUTPUT_DIRECTORY),.) - INSTALL = $(VBIN:%=$(INSBIN)/%) - CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%) + INSTALL = $(VBIN:%=$(INSBIN)/%$(EXEEXT)) + CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(EXEEXT)) endif <%endif%> |