gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-22 22:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to use NNN_INSTALL_DIR variables instead of NNN_INSTALLATION_DIR

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14568 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-09-26 00:30:35 +00:00
parent 4eacdeea7b
commit defc8b3603
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Instance/ctool.make
View file

@ -30,11 +30,16 @@ ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# Deprecation warning - will be remove on Dec 2002
ifneq ($(CTOOL_INSTALLATION_DIR),)
$(warning CTOOL_INSTALLATION_DIR is deprecated! Please use CTOOL_INSTALL_DIR instead)
endif
# This is the directory where the ctools get installed. If you don't
# specify a directory they will get installed in the GNUstep Local
# root.
ifeq ($(CTOOL_INSTALLATION_DIR),)
CTOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)
ifeq ($(CTOOL_INSTALL_DIR),)
CTOOL_INSTALL_DIR = $(GNUSTEP_TOOLS)
endif
.PHONY: internal-ctool-all_ \
@ -61,16 +66,16 @@ $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(C_OBJ_FILES) \
$(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
$(ALL_TOOL_LIBS)$(END_ECHO)
internal-ctool-install_:: $(CTOOL_INSTALLATION_DIR)
internal-ctool-install_:: $(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)
$(ECHO_INSTALLING)$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
$(CTOOL_INSTALLATION_DIR)$(END_ECHO)
$(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)$(END_ECHO)
$(CTOOL_INSTALLATION_DIR):
$(MKINSTALLDIRS) $(CTOOL_INSTALLATION_DIR)
$(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR):
@$(MKINSTALLDIRS) $@
internal-ctool-uninstall_::
rm -f $(CTOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
rm -f $(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
## Local variables:
## mode: makefile

17
Instance/objc.make
View file

@ -34,11 +34,16 @@ endif
internal-objc_program-install_ \
internal-objc_program-uninstall_
# Deprecation warning - will be remove on Dec 2002
ifneq ($(OBJC_PROGRAM_INSTALLATION_DIR),)
$(warning OBJC_PROGRAM_INSTALLATION_DIR is deprecated! Please use OBJC_PROGRAM_INSTALL_DIR instead)
endif
# This is the directory where the objc programs get installed. If you
# don't specify a directory they will get installed in the Tools
# directory in GNUSTEP_LOCAL_ROOT.
ifeq ($(OBJC_PROGRAM_INSTALLATION_DIR),)
OBJC_PROGRAM_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)
ifeq ($(OBJC_PROGRAM_INSTALL_DIR),)
OBJC_PROGRAM_INSTALL_DIR = $(GNUSTEP_TOOLS)
endif
ALL_OBJC_LIBS = \
@ -57,16 +62,16 @@ $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_OBJC_LIBS)$(END_ECHO)
internal-objc_program-install_:: $(OBJC_PROGRAM_INSTALLATION_DIR)
internal-objc_program-install_:: $(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
$(ECHO_INSTALLING)$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
$(OBJC_PROGRAM_INSTALLATION_DIR)$(END_ECHO)
$(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)
$(OBJC_PROGRAM_INSTALLATION_DIR):
$(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR):
@$(MKINSTALLDIRS) $@
internal-objc_program-uninstall_::
rm -f $(OBJC_PROGRAM_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
rm -f $(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
## Local variables:
## mode: makefile