From 9470cf0edcfe0f29f9087354d3a4847f508f1113 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 22 Feb 2000 16:03:03 +0000
Subject: [PATCH] Changed HOST_ARCH to EPICS_HOST_ARCH.

---
 configure/CONFIG_BASE   |  9 +++++----
 configure/CONFIG_COMMON |  6 +++---
 configure/CONFIG_SITE   | 12 +++++-------
 configure/RELEASE       |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index 1ae02def3..85b743419 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -5,7 +5,8 @@ endif
 #---------------------------------------------------------------
 # Epics base directories
 
-EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(HOST_ARCH)
+EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
+EPICS_EXTENSIONS_HOST_BIN = $(EPICS_EXTENSIONS)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_INCLUDE  = $(EPICS_BASE)/include
 
 ifdef T_A
@@ -68,7 +69,7 @@ LEX   = $(ELEX)
 SNC = $(EPICS_BASE_HOST_BIN)/snc$(HOSTEXE)
 
 # adl2dl 
-ADL2DL = $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/adl2dl
+ADL2DL = $(EPICS_EXTENSIONS_HOST_BIN)/adl2dl
 
 # sch2edif compiler and flags
 SCH2EDIF = sch2edif
@@ -78,10 +79,10 @@ SCH2EDIF_FLAGS =
  
 # e2db and flags
 #    - again there is an assumption where edb.def is installed.
-E2DB = $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/e2db
+E2DB = $(EPICS_EXTENSIONS_HOST_BIN)/e2db
 E2DB_SYSFLAGS = -ate -d $(EPICS_EXTENSIONS)/templates/capfast/edb.def
 E2DB_FLAGS =
 
 #dbst 
-DBST = $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/dbst
+DBST = $(EPICS_EXTENSIONS_HOST_BIN)/dbst
 
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index a8333ff98..10218bd2a 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -14,10 +14,10 @@
 CROSS1 = $(CROSS_COMPILER_TARGET_ARCHS$(word 1,$(CROSS_COMPILER_HOST_ARCHS)))
 
 # CROSS2 will be defined only when CROSS_COMPILER_HOST_ARCHS is defined
-# and HOST_ARCH is one of it's words  
-CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))))
+# and EPICS_HOST_ARCH is one of it's words  
+CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(EPICS_HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))))
 
-BUILD_ARCHS = $(HOST_ARCH) $(CROSS1) $(CROSS2)
+BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 
 #-------------------------------------------------------
 # Divider and suffix
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 79cc5df8c..83738a4c0 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -22,11 +22,9 @@
 #	WIN32
 #	LynxOS
 #
-#  HOST_ARCH now an environment variable
-#  HOST_ARCH=$(shell /usr/local/epics/startup/HostArch)
-ifndef HOST_ARCH
-	HOST_ARCH=unsupported
-endif
+#  EPICS_HOST_ARCH is an environment variable
+#  EPICS_HOST_ARCH=$(shell /usr/local/epics/startup/EpicsHostArch)
+
 
 #  The cross-compiler architectures to build EPICS for
 #
@@ -47,7 +45,7 @@ CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
 #  the build for the CROSS_COMPILER_TARGET_ARCHS
 #  uncomment the following line and specify them.
 #
-#CROSS_COMPILER_HOST_ARCHS=
+CROSS_COMPILER_HOST_ARCHS=solaris-sparc linux-x86
 
 #  Client ANSI C Compiler (for Host builds)
 #   GCC     GNU			(gcc -ansi)
@@ -83,7 +81,7 @@ CXXCMPLR=STRICT
 #                 distribution file contains YES override
 #
 #     NOTE solaris and sun4: If YES then LD_LIBRARY_PATH must
-#     include fullpathname $(INSTALL_LOCATION)/lib/$(HOST_ARCH)
+#     include fullpathname $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH)
 #     for both the base build and when invoking base executables
 SHARED_LIBRARIES=NO
 
diff --git a/configure/RELEASE b/configure/RELEASE
index 2bfab41b7..abfae9ddc 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,6 +1,6 @@
 #RELEASE Location of external products
 #
-# NOTE: RELEASE.$(HOST_ARCH) files will override
+# NOTE: RELEASE.$(EPICS_HOST_ARCH) files will override
 
 #  Tornado directory
 VX_DIR = /usr/local/vw/tornado101