epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

moved installed files under the base/install directory by default

Browse Source 
added vpath for lex skel files
This commit is contained in:
Jeff Hill
2000-01-28 01:43:34 +00:00
parent 6638fc6e1e
commit 0e15963517
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure/CONFIG_COMMON
View File

@@ -34,7 +34,7 @@ PERL=perl
#-------------------------------------------------------
# Directories
INSTALL_LOCATION = $(TOP)
INSTALL_LOCATION = $(TOP)/install
TOOLS = $(CONFIG)/tools
INSTALL_LOCATION_LIB = $(INSTALL_LOCATION)/lib
@@ -63,8 +63,8 @@ INSTALL_LIBRARY = $(INSTALL)
#-------------------------------------------------------
# vpath directories
GENERIC_SRC_DIRS = . .. $(SRC_DIRS)
OS_SRC_DIRS += $(foreach dir, $(SRC_DIRS) .., \
GENERIC_SRC_DIRS = .. $(SRC_DIRS)
OS_SRC_DIRS += . $(foreach dir, $(SRC_DIRS) .., \
$(dir)/os/$(OS_CLASS) $(dir)/os/posix $(dir)/os/default )
ALL_SRC_DIRS = $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
@@ -332,14 +332,14 @@ INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%)
#
INSTALL_INC += $(foreach inc, $(INC), \
$(firstword \
$(INSTALL_INC_hhh) \
$(INSTALL_INC_ddd) \
$(INSTALL_INC_iii) ) )
$(OS_INSTALL_INC) \
$(GENERIC_INSTALL_INC) \
$(GENERATED_INSTALL_INC) ) )
#
# Rule 1
#
INSTALL_INC_hhh = $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INSTALL_INC_ggg) )
OS_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INSTALL_INC_ggg) )
INSTALL_INC_ggg = $(foreach dir, $(OS_SRC_DIRS), $(INSTALL_INC_fff) )
INSTALL_INC_fff = $(subst $(dir)/, , $(INSTALL_INC_eee) )
INSTALL_INC_eee = $(wildcard $(addsuffix /$(inc), $(dir)) )
@@ -347,7 +347,7 @@ INSTALL_INC_eee = $(wildcard $(addsuffix /$(inc), $(dir)) )
#
# Rule 2
#
INSTALL_INC_ddd = $(addprefix $(INSTALL_INCLUDE)/, $(INSTALL_INC_ccc) )
GENERIC_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/, $(INSTALL_INC_ccc) )
INSTALL_INC_ccc = $(foreach dir, .. $(SRC_DIRS), $(INSTALL_INC_bbb) )
INSTALL_INC_bbb = $(subst $(dir)/, , $(INSTALL_INC_aaa) )
INSTALL_INC_aaa = $(wildcard $(addsuffix /$(inc), $(dir)) )
@@ -355,6 +355,6 @@ INSTALL_INC_aaa = $(wildcard $(addsuffix /$(inc), $(dir)) )
#
# Rule 3
#
INSTALL_INC_iii = $(INSTALL_INCLUDE)/os/$(OS_CLASS)/$(inc)
GENERATED_INSTALL_INC = $(INSTALL_INCLUDE)/os/$(OS_CLASS)/$(inc)
endif

12
configure/RULES_BUILD
View File

@@ -37,9 +37,7 @@ vpath %.cpp $(USER_VPATH) $(ALL_SRC_DIRS)
vpath %.C $(USER_VPATH) $(ALL_SRC_DIRS)
vpath %.rc $(USER_VPATH) $(ALL_SRC_DIRS)
vpath %.h $(USER_VPATH) $(ALL_SRC_DIRS)
vpath %.skel.static $(USER_VPATH) $(ALL_SRC_DIRS)
# This prevents base/src/include/*.h from being installed. Why??
#vpath %.h ../os/$(OS_CLASS)
vpath %.skel.static $(USER_VPATH) $(GENERIC_SRC_DIRS)
#---------------------------------------------------------------
@@ -583,12 +581,12 @@ $(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../%
@echo "Installing man file $@"
@$(INSTALL) -d -m 644 $< $(@D)
$(INSTALL_INCLUDE)/os/$(OS_CLASS)/%: %
@echo "Installing include file $@"
$(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
@echo "Installing os dependent include file $@"
@$(INSTALL) -d -m 644 $< $(@D)
$(INSTALL_INCLUDE)/%: %
@echo "Installing include file $@"
$(INSTALL_INCLUDE)/% : %
@echo "Installing generic include file $@"
@$(INSTALL) -d -m 644 $< $(@D)
$(INSTALL_DOC)/%: %