summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-04 03:25:48 +0000
committerGitHub <noreply@github.com>2023-01-04 14:25:48 +1100
commitf9ee0571a773186b8a6236c26fcfe0e480937aec (patch)
treee7ab15af27301aaa24904d7d38e69ffdc420ad16
parent6d41ba75d3631b3187a1cddebf3019fd80d741bd (diff)
Remove unused Makefile paths (#19487)
-rw-r--r--Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index e10816aa78..3479abca04 100644
--- a/Makefile
+++ b/Makefile
@@ -48,17 +48,10 @@ ON_ERROR := error_occurred=1
BREAK_ON_ERRORS = no
-STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
-ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-ROOT_DIR := $(dir $(ROOT_MAKEFILE))
+ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
ifeq ($(ROOT_DIR),)
ROOT_DIR := .
endif
-ABS_STARTING_MAKEFILE := $(abspath $(STARTING_MAKEFILE))
-ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE))
-ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE))
-ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE))
-STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR))
include paths.mk