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

Updated location of tool resources for the new gnustep-make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24619 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-17 17:36:47 +00:00
parent 654e7daa31
commit a5a581a63c
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2007-02-17 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/tool.make (GNUSTEP_SHARED_BUNDLE_INSTALL_DIR): Install
tool resources in GNUSTEP_LIBRARY/Tools/Resources.
($(GNUSTEP_LIBRARY)/Tools): Build this directory instead of
$(TOOL_INSTALL_DIR)/Resources.
(internal-tool-install_): Depend on the new rule instead of the
old one.
2007-02-17 Nicola Pero <nicola.pero@meta-innovation.com>
* common.make: Added new flag quiet=yes that disables the

7
Instance/Shared/bundle.make
View file

@ -40,14 +40,13 @@
# directory to install, relative to GNUSTEP_BUILD_DIR during build
# (and installation dir when installed). For example, for a normal
# bundle it would be $(BUNDLE_DIR_NAME); for an application it would
# be $(APP_DIR_NAME); for a library or a tool,
# Resources/$(GNUSTEP_INSTANCE).
# be $(APP_DIR_NAME); for a library or a tool, $(GNUSTEP_INSTANCE).
#
# GNUSTEP_SHARED_BUNDLE_INSTALL_DIR : the path to the dir
# in which the bundle is to be installed. For example, for a normal
# bundle it would be $(BUNDLE_INSTALL_DIR); for an application it would
# be $(APP_INSTALL_DIR); for a library or tool, $(LIBRARY_INSTALL_DIR),
# or $(TOOL_INSTALL_DIR).
# be $(APP_INSTALL_DIR); for a library or tool, $(GNUSTEP_RESOURCES),
# or $(GNUSTEP_TOOL_RESOURCES).
#
# $(GNUSTEP_INSTANCE)_RESOURCE_FILES : a list of resource files to install.
# They are recursively copied (/symlinked), so it might also include dirs.

9
Instance/tool.make
View file

@ -105,7 +105,10 @@ ifeq ($($(GNUSTEP_INSTANCE)_HAS_RESOURCE_BUNDLE),yes)
# Include the rules to build resource bundles
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(GNUSTEP_BUILD_DIR)/Resources/$(GNUSTEP_INSTANCE)
GNUSTEP_SHARED_BUNDLE_MAIN_PATH = Resources/$(GNUSTEP_INSTANCE)
GNUSTEP_SHARED_BUNDLE_INSTALL_DIR = $(TOOL_INSTALL_DIR)
# TODO: Think if we shouldn't add a new GNUSTEP_TOOL_RESOURCES
# variable that is set to GNUSTEP_LIBRARY/Tools, and use it here. But
# we'd need to update Instance/Shared/bundle.make if we do.
GNUSTEP_SHARED_BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Tools
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
internal-tool-all_:: shared-instance-bundle-all
@ -114,10 +117,10 @@ internal-tool-copy_into_dir:: shared-instance-bundle-copy_into_dir
$(TOOL_INSTALL_DIR):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
$(TOOL_INSTALL_DIR)/Resources:
$(GNUSTEP_LIBRARY)/Tools:
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
internal-tool-install_:: $(TOOL_INSTALL_DIR)/Resources \
internal-tool-install_:: $(GNUSTEP_LIBRARY)/Tools \
shared-instance-bundle-install
internal-tool-uninstall:: shared-instance-bundle-uninstall