Make an effort to use a framework-like installation structure for library resources, might be helpful in the future

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24839 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-03-09 18:25:18 +00:00
parent fb579c49fc
commit 866453137f
2 changed files with 16 additions and 7 deletions

View file

@ -1,3 +1,9 @@
2007-03-09 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/library.make: Changed resource installation directory
structure to be very similar to the one used for frameworks.
Might be helpful in the future.
2007-03-09 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/Shared/bundle.make: Internal shared bundle install

View file

@ -315,23 +315,26 @@ 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)/Versions/$(INTERFACE_VERSION)
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE)/Versions/$(INTERFACE_VERSION)/Resources/
# 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)/Versions
GNUSTEP_SHARED_BUNDLE_INSTALL_PATH = $(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE)/Versions
# GNUSTEP_LIBRARY/Libraries/gnustep-base/Versions/1.14/Resources/
# This is similar to a framework resource directory, which might be
# helpful in the future.
GNUSTEP_SHARED_BUNDLE_INSTALL_NAME = Resources
GNUSTEP_SHARED_BUNDLE_INSTALL_LOCAL_PATH = $(GNUSTEP_INSTANCE)/Versions/$(INTERFACE_VERSION)
GNUSTEP_SHARED_BUNDLE_INSTALL_PATH = $(GNUSTEP_LIBRARY)/Libraries/$(GNUSTEP_INSTANCE)/Versions/$(INTERFACE_VERSION)
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)/Versions:
$(GNUSTEP_LIBRARY)/Libraries/$(GNUSTEP_INSTANCE)/Versions/$(INTERFACE_VERSION):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
internal-library-install_:: $(GNUSTEP_RESOURCES)/$(GNUSTEP_INSTANCE)/Versions shared-instance-bundle-install
internal-library-install_:: $(GNUSTEP_LIBRARY)/Libraries/$(GNUSTEP_INSTANCE)/Versions/$(INTERFACE_VERSION) \
shared-instance-bundle-install
internal-library-uninstall:: shared-instance-bundle-uninstall