File tree Expand file tree Collapse file tree 11 files changed +22
-11
lines changed
Expand file tree Collapse file tree 11 files changed +22
-11
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,8 @@ TLS_LDFLAG_DYNAMIC = -lssl -lcrypto
2020endif
2121endif
2222
23- MAKEFILE_DIR := $(shell git rev-parse --show-toplevel)
23+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
24+ MAKEFILE_DIR := $(dir $(MAKEFILE_PATH ) )
2425BUILD_DIR := $(MAKEFILE_DIR ) /dist
2526
2627# ARGS
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67LIB_DIR := $(PROJECT_DIR ) /dist
78INCLUDE_DIR := $(PROJECT_DIR ) /include
89WEBUI_LIB_NAME = webui-2
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67LIB_DIR := $(PROJECT_DIR ) /dist
78INCLUDE_DIR := $(PROJECT_DIR ) /include
89WEBUI_LIB_NAME = webui-2
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67LIB_DIR := $(PROJECT_DIR ) /dist
78INCLUDE_DIR := $(PROJECT_DIR ) /include
89WEBUI_LIB_NAME = webui-2
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67LIB_DIR := $(PROJECT_DIR ) /dist
78INCLUDE_DIR := $(PROJECT_DIR ) /include
89WEBUI_LIB_NAME = webui-2
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67TARGET := $(firstword $(MAKECMDGOALS ) )
78LIB_DIR := $(PROJECT_DIR ) /dist
89ifeq ($(TARGET ) , debug)
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67TARGET := $(firstword $(MAKECMDGOALS ) )
78LIB_DIR := $(PROJECT_DIR ) /dist
89ifeq ($(TARGET ) , debug)
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67TARGET := $(firstword $(MAKECMDGOALS ) )
78LIB_DIR := $(PROJECT_DIR ) /dist
89ifeq ($(TARGET ) , debug)
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67TARGET := $(firstword $(MAKECMDGOALS ) )
78LIB_DIR := $(PROJECT_DIR ) /dist
89ifeq ($(TARGET ) , debug)
Original file line number Diff line number Diff line change 22
33# == 1. VARIABLES =============================================================
44
5- PROJECT_DIR := $(shell git rev-parse --show-toplevel)
5+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST ) ) )
6+ PROJECT_DIR := $(dir $(MAKEFILE_PATH ) ) /../../../
67TARGET := $(firstword $(MAKECMDGOALS ) )
78LIB_DIR := $(PROJECT_DIR ) /dist
89ifeq ($(TARGET ) , debug)
You can’t perform that action at this time.
0 commit comments