From e91e9997e1c49c0f72a2f93b23fcad1849b5c3e5 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sun, 5 Nov 2023 22:25:46 +0100
Subject: Makefile: align assignments

---
 Makefile | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index de19347..ccabff5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,26 @@
 include prelude.mk
 
-TOOLSET ?= mingw
-PLATFORM ?= auto
-CONFIGURATION ?= Debug
-BOOST_VERSION ?= 1.72.0
-BOOST_LIBRARIES := --with-filesystem --with-program_options
-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.72.0
+BOOST_LIBRARIES := --with-filesystem --with-program_options
+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