From f296c6e24b6c807fa615d4ae4a834db1e6378acd Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 4 Nov 2023 12:16:53 +0100 Subject: Makefile: align assignments --- Makefile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index febfcf9..1bfc71b 100644 --- a/Makefile +++ b/Makefile @@ -1,25 +1,26 @@ include prelude.mk -TOOLSET ?= mingw -PLATFORM ?= auto -CONFIGURATION ?= Debug -BOOST_VERSION ?= 1.65.0 -BOOST_LIBRARIES := --with-filesystem --with-program_options --with-test -CMAKE_FLAGS ?= +this_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +src_dir := $(this_dir) +build_dir := $(this_dir)build +boost_dir := $(build_dir)/boost +cmake_dir := $(build_dir)/cmake +install_dir := $(build_dir)/install -this_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -src_dir := $(this_dir) -build_dir := $(this_dir)build -boost_dir := $(build_dir)/boost -cmake_dir := $(build_dir)/cmake -DESTDIR ?= $(build_dir)/install +TOOLSET ?= mingw +PLATFORM ?= auto +CONFIGURATION ?= Debug +BOOST_VERSION ?= 1.65.0 +BOOST_LIBRARIES := --with-filesystem --with-program_options --with-test +CMAKE_FLAGS ?= +INSTALL_PREFIX ?= $(install_dir) $(eval $(call noexpand,TOOLSET)) $(eval $(call noexpand,PLATFORM)) $(eval $(call noexpand,CONFIGURATION)) $(eval $(call noexpand,BOOST_VERSION)) $(eval $(call noexpand,CMAKE_FLAGS)) -$(eval $(call noexpand,DESTDIR)) +$(eval $(call noexpand,INSTALL_PREFIX)) .PHONY: all all: build @@ -51,7 +52,7 @@ build: --toolset '$(call escape,$(TOOLSET))' \ --platform '$(call escape,$(PLATFORM))' \ --configuration '$(call escape,$(CONFIGURATION))' \ - --install '$(call escape,$(DESTDIR))' \ + --install '$(call escape,$(INSTALL_PREFIX))' \ --boost '$(call escape,$(boost_dir))' \ -- \ '$(call escape,$(src_dir))' \ -- cgit v1.2.3