[lmi-commits] [lmi] odd/multiarch 3551a75 1/6: Make $(build_directory) an immediately-expanded variable again

[Greg Chicares]

branch: odd/multiarch
commit 3551a755e4674f0fdd856b452f38cb1839058b9e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Make $(build_directory) an immediately-expanded variable again
    
    Grouping all directory variables together aids readability in a way;
    but immediate expansion is simple and robust, which is preferable when
    a choice must be made. See:
      https://lists.nongnu.org/archive/html/lmi/2019-04/msg00004.html
---
 GNUmakefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index cf5a0e7..08b9e61 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -124,9 +124,6 @@ locallibdir     := $(exec_prefix)/local/lib
 localincludedir := $(exec_prefix)/local/include
 test_dir        := $(prefix)/test
 touchstone_dir  := $(prefix)/touchstone
-# deferred evaluation to reflect variables ($(build_type), e.g.) defined later
-# Eventually prepend "$(toolset)-" to $(exec_prefix) .
-build_directory  = $(exec_prefix)/build/$(build_type)
 
 
################################################################################
 
@@ -177,12 +174,8 @@ $(srcdir)/local_options.make:: ;
 
 build_type ?= ship
 toolset ?= gcc
-XXbuild_directory := \
-  $(srcdir)/../build/$(notdir $(srcdir))/$(uname)/$(toolset)/$(build_type)
 # Eventually prepend "$(toolset)-" to $(exec_prefix) .
-# Is it better to define "build_directory =" above (deferred), with other
-# directories...or here, "build_directory :=", away from other directories?
-# build_directory := $(exec_prefix)/build/$(build_type)
+build_directory := $(exec_prefix)/build/$(build_type)
 
 gpl_files := \
   COPYING \