From 89cfbc5e218ac9d1752549f5739642810d1fb253 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 20 Mar 2003 20:36:16 +0000
Subject: [PATCH] Moved INSTALL_LOCATION definition to RELEASE file for
 SHRLIB_SEARCH_DIRS.

---
 configure/CONFIG_COMMON           | 2 +-
 configure/CONFIG_SITE             | 2 +-
 configure/RELEASE                 | 4 ++++
 configure/tools/convertRelease.pl | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 575169728..75cda6e34 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -45,7 +45,7 @@ CHECK_RELEASE_NO =
 #-------------------------------------------------------
 # Directories
 
-INSTALL_LOCATION            = $(TOP)
+INSTALL_LOCATION            ?= $(TOP)
 TOOLS                       = $(CONFIG)/tools
 
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 70c4faa7c..91ea37f4b 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -123,5 +123,5 @@ HOST_WARN=YES
 CROSS_WARN=YES
 
 #  Installation directory
-INSTALL_LOCATION=$(TOP)
+#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
 
diff --git a/configure/RELEASE b/configure/RELEASE
index 0dd6b65a1..869f301c9 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -15,3 +15,7 @@
 VX_DIR = /usr/local/vw/tornado202
 # Is Tornado version  >= 2.2 ?   must be either YES or NO
 TORNADO_VERSION_2_2 = NO
+
+# If you don't want to install into $(TOP) dir then 
+# define INSTALL_LOCATION with full path name here
+#INSTALL_LOCATION=/home/phoebus/JBA/install
diff --git a/configure/tools/convertRelease.pl b/configure/tools/convertRelease.pl
index b716d60ea..46138e1c3 100755
--- a/configure/tools/convertRelease.pl
+++ b/configure/tools/convertRelease.pl
@@ -118,6 +118,7 @@ sub readRelease {
 	# Handle "<macro> = <path>"
 	($macro, $path) = /^\s*(\w+)\s*=\s*(.*)/;
 	if ($macro ne "") {
+		$macro="TOP" if $macro =~ /^INSTALL_LOCATION/ ;
 		if (exists $Rmacros->{$macro}) {
 			delete $Rmacros->{$macro};
 		} else {