From 39eb1ce70e6a2246498a4cd2add3516dd9a62a5c Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 30 Jan 2023 17:21:48 +0700 Subject: [PATCH] minor clean up --- tools/top.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/top.mk b/tools/top.mk index cefe9884c..af8d698f5 100644 --- a/tools/top.mk +++ b/tools/top.mk @@ -6,22 +6,26 @@ endif # https://stackoverflow.com/questions/714100/os-detecting-makefile/52062069#52062069 ifeq '$(findstring ;,$(PATH))' ';' # PATH contains semicolon - so we're definitely on Windows. -CMDEXE := 1# makefile shell commands should use syntax for DOS CMD, not unix sh +CMDEXE := 1 + +# makefile shell commands should use syntax for DOS CMD, not unix sh # Unfortunately, SHELL may point to sh or bash, which can't accept DOS syntax. -# $(info top.mk: SHELL=$(SHELL)) # We can't just use sh, because while sh and/or bash shell may be available, # many Windows environments won't have utilities like realpath used below, so... -SHELL := cmd.exe# Force DOS command shell on Windows. +# Force DOS command shell on Windows. +SHELL := cmd.exe endif #$(info top.mk: SHELL=$(SHELL)) -#$(info top.mk: CMDEXE=$(CMDEXE)...) +#$(info top.mk: CMDEXE=$(CMDEXE)) # Set TOP to be the path to get from the current directory (where make was # invoked) to the top of the tree. $(lastword $(MAKEFILE_LIST)) returns # the name of this makefile relative to where make was invoked. -THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))# this makefile is the one most recently appended to the list of makefiles -TOP := $(patsubst %/tools/top.mk,%,$(THIS_MAKEFILE))# strip off /tools/top.mk to get for example ../../.. +THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST)) + +# strip off /tools/top.mk to get for example ../../.. +TOP := $(patsubst %/tools/top.mk,%,$(THIS_MAKEFILE)) #$(info top.mk: Initial TOP=$(TOP)) # Set TOP to an absolute path, for example /tinyUSB (from ../../..)