From 764621d94603b4ddc59c92dcc633cac627551ce1 Mon Sep 17 00:00:00 2001
From: sophia-guo <sophia.gwf@gmail.com>
Date: Tue, 12 Dec 2023 14:38:46 -0500
Subject: [PATCH] Moving LIB_DIR visible for all make process (#480)

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 makefile    | 11 +++++++++++
 settings.mk |  7 -------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/makefile b/makefile
index 850d6608..6b21b22f 100644
--- a/makefile
+++ b/makefile
@@ -25,6 +25,9 @@ export JAVA_HOME := $(TEST_JDK_HOME)
 $(info JAVA_HOME is set to $(JAVA_HOME))
 endif
 
+
+
+
 D = /
 MKTREE = mkdir -p
 SUBDIRS = ..
@@ -32,6 +35,14 @@ SUBDIRS = ..
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..
 endif
+ifndef LIB_DIR
+	LIB_DIR:=$(TEST_ROOT)$(D)TKG$(D)lib
+endif
+ifeq ($(CYGWIN),1)
+	LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
+endif
+LIB_DIR:=$(subst \,/,$(LIB_DIR))
+
 
 _TESTTARGET = $(firstword $(MAKECMDGOALS))
 TESTTARGET = $(patsubst _%,%,$(_TESTTARGET))
diff --git a/settings.mk b/settings.mk
index b45e9042..4224a716 100644
--- a/settings.mk
+++ b/settings.mk
@@ -171,13 +171,6 @@ endif
 #######################################
 # common dir and jars
 #######################################
-ifndef LIB_DIR
-	LIB_DIR:=$(TEST_ROOT)$(D)TKG$(D)lib
-endif
-ifeq ($(CYGWIN),1)
-	LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
-endif
-LIB_DIR:=$(subst \,/,$(LIB_DIR))
 
 TESTNG=$(LIB_DIR)$(D)testng.jar$(P)$(LIB_DIR)$(D)jcommander.jar
 RESOURCES_DIR=$(JVM_TEST_ROOT)$(D)TestConfig$(D)resources