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

Do not use override when defining HEADER variables

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12998 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-03-05 15:13:56 +00:00
parent 9abe2ed368
commit b0d4108bd3
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Instance/Shared/headers.make
View file

@ -39,12 +39,7 @@
# shared-instance-headers-uninstall
#
# NB: The 'override' in all this file are needed to override the
# Master/rules.make setting of HEADER_FILES and similar variables.
# Once that setting will be removed (as it should be), the 'override'
# in this file should be removed as well.
override HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES)
HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES)
.PHONY: \
shared-install-headers-install \
@ -58,17 +53,17 @@ shared-instance-headers-uninstall:
else # we have some HEADER_FILES
override HEADER_FILES_DIR = $($(GNUSTEP_INSTANCE)_HEADER_FILES_DIR)
HEADER_FILES_DIR = $($(GNUSTEP_INSTANCE)_HEADER_FILES_DIR)
ifeq ($(HEADER_FILES_DIR),)
override HEADER_FILES_DIR = .
HEADER_FILES_DIR = .
endif
override HEADER_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR)
HEADER_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR)
# Please use `.' to force it to stay empty
ifeq ($(HEADER_FILES_INSTALL_DIR),)
override HEADER_FILES_INSTALL_DIR = $(GNUSTEP_INSTANCE)
HEADER_FILES_INSTALL_DIR = $(GNUSTEP_INSTANCE)
endif
#

2
Instance/framework.make
View file

@ -50,7 +50,7 @@ endif
# where xxx is the framework name
#
override HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES)
HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES)
ALL_FRAMEWORK_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \

2
Instance/subproject.make
View file

@ -28,7 +28,7 @@ endif
internal-subproject-install \
internal-subproject-uninstall
override HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES)
HEADER_FILES = $($(GNUSTEP_INSTANCE)_HEADER_FILES)
FRAMEWORK_HEADERS_DIR = $(FRAMEWORK_VERSION_DIR_NAME)/Headers/
FRAMEWORK_HEADER_FILES = $(patsubst %.h,$(FRAMEWORK_HEADERS_DIR)%.h,$(HEADER_FILES))