Moved INSTALL_LOCATION definition to RELEASE file for SHRLIB_SEARCH_DIRS.
This commit is contained in:
@@ -45,7 +45,7 @@ CHECK_RELEASE_NO =
|
||||
#-------------------------------------------------------
|
||||
# Directories
|
||||
|
||||
INSTALL_LOCATION = $(TOP)
|
||||
INSTALL_LOCATION ?= $(TOP)
|
||||
TOOLS = $(CONFIG)/tools
|
||||
|
||||
INSTALL_LOCATION_LIB = $(INSTALL_LOCATION)/lib
|
||||
|
||||
@@ -123,5 +123,5 @@ HOST_WARN=YES
|
||||
CROSS_WARN=YES
|
||||
|
||||
# Installation directory
|
||||
INSTALL_LOCATION=$(TOP)
|
||||
#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user