mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-31 09:21:19 +00:00
Implemented a FINAL_TOOL_INSTALL_DIR to support fine control over installation
of tool executbale git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15310 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
0d773a386e
commit
9b0aa2fc31
1 changed files with 11 additions and 4 deletions
|
@ -46,6 +46,13 @@ ifeq ($(TOOL_INSTALL_DIR),)
|
||||||
TOOL_INSTALL_DIR = $(GNUSTEP_TOOLS)
|
TOOL_INSTALL_DIR = $(GNUSTEP_TOOLS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# This is the 'final' directory in which we copy the tool executable, including
|
||||||
|
# the target and library-combo paths. You can override it in special occasions
|
||||||
|
# (eg, installing an executable into a web server's cgi dir).
|
||||||
|
ifeq ($(FINAL_TOOL_INSTALL_DIR),)
|
||||||
|
FINAL_TOOL_INSTALL_DIR = $(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
endif
|
||||||
|
|
||||||
ALL_TOOL_LIBS = \
|
ALL_TOOL_LIBS = \
|
||||||
$(shell $(WHICH_LIB_SCRIPT) \
|
$(shell $(WHICH_LIB_SCRIPT) \
|
||||||
$(ALL_LIB_DIRS) \
|
$(ALL_LIB_DIRS) \
|
||||||
|
@ -73,16 +80,16 @@ internal-tool-copy_into_dir::
|
||||||
$(COPY_INTO_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)
|
$(COPY_INTO_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)
|
||||||
|
|
||||||
# This rule runs $(MKDIRS) only if needed
|
# This rule runs $(MKDIRS) only if needed
|
||||||
$(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR):
|
$(FINAL_TOOL_INSTALL_DIR):
|
||||||
@$(MKINSTALLDIRS) $@
|
@$(MKINSTALLDIRS) $@
|
||||||
|
|
||||||
internal-tool-install_:: $(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
|
internal-tool-install_:: $(FINAL_TOOL_INSTALL_DIR)
|
||||||
$(ECHO_INSTALLING)$(INSTALL_PROGRAM) -m 0755 \
|
$(ECHO_INSTALLING)$(INSTALL_PROGRAM) -m 0755 \
|
||||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||||
$(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)
|
$(FINAL_TOOL_INSTALL_DIR)$(END_ECHO)
|
||||||
|
|
||||||
internal-tool-uninstall_::
|
internal-tool-uninstall_::
|
||||||
rm -f $(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
rm -f $(FINAL_TOOL_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||||
|
|
||||||
# NB: We don't have any cleaning targets for tools here, because we
|
# NB: We don't have any cleaning targets for tools here, because we
|
||||||
# clean during the Master make invocation.
|
# clean during the Master make invocation.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue