From 0e159635170eebd2d2a4470e65c85b0af692271a Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Fri, 28 Jan 2000 01:43:34 +0000
Subject: [PATCH] moved installed files under the base/install directory by
 default added vpath for lex skel files

---
 configure/CONFIG_COMMON | 18 +++++++++---------
 configure/RULES_BUILD   | 12 +++++-------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index b124d1bb3..8531651f2 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -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
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 390c364c8..faaa7b865 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -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)/%: %