mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Use a 'Versions' directory in the path to the library resource bundle so it's easier to be backwards compatible with previous unversioned gnustep-base resources
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24837 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5fd68fb3c0
commit
fb579c49fc
1 changed files with 5 additions and 5 deletions
|
@ -315,23 +315,23 @@ internal-library-check::
|
|||
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)/$(INTERFACE_VERSION)
|
||||
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(GNUSTEP_BUILD_DIR)/Resources/$(GNUSTEP_INSTANCE)/Versions/$(INTERFACE_VERSION)
|
||||
|
||||
# We want to install gnustep-base resources into
|
||||
# GNUSTEP_RESOURCES/gnustep-base/1.14/.
|
||||
GNUSTEP_SHARED_BUNDLE_INSTALL_NAME = $(INTERFACE_VERSION)
|
||||
GNUSTEP_SHARED_BUNDLE_INSTALL_LOCAL_PATH = Resources/$(GNUSTEP_INSTANCE)
|
||||
GNUSTEP_SHARED_BUNDLE_INSTALL_PATH = $(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE)
|
||||
GNUSTEP_SHARED_BUNDLE_INSTALL_LOCAL_PATH = Resources/$(GNUSTEP_INSTANCE)/Versions
|
||||
GNUSTEP_SHARED_BUNDLE_INSTALL_PATH = $(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE)/Versions
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
|
||||
|
||||
internal-library-all_:: shared-instance-bundle-all
|
||||
internal-library-copy_into_dir:: shared-instance-bundle-copy_into_dir
|
||||
|
||||
$(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE):
|
||||
$(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE)/Versions:
|
||||
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
|
||||
|
||||
internal-library-install_:: $(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE) shared-instance-bundle-install
|
||||
internal-library-install_:: $(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE)/Versions shared-instance-bundle-install
|
||||
|
||||
internal-library-uninstall:: shared-instance-bundle-uninstall
|
||||
|
||||
|
|
Loading…
Reference in a new issue