[lmi-commits] [lmi] odd/multiarch 3e175ec 1/3: Rename $(build_directory) to the terser $(build_dir)

[Greg Chicares]

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

    Rename $(build_directory) to the terser $(build_dir)
---
 GNUmakefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 13daed3..0e8e6f5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -181,7 +181,7 @@ $(srcdir)/local_options.make:: ;
 build_type ?= ship
 toolset ?= gcc
 # Eventually prepend "$(toolset)-" to $(exec_prefix) .
-build_directory := $(exec_prefix)/build/$(build_type)
+build_dir := $(exec_prefix)/build/$(build_type)
 
 gpl_files := \
   COPYING \
@@ -219,12 +219,12 @@ MAKETARGET = \
                     yyyymmddhhmm='$(yyyymmddhhmm)' \
   $(MAKECMDGOALS)
 
-.PHONY: $(build_directory)
-$(build_directory): $(gpl_files)
+.PHONY: $(build_dir)
+$(build_dir): $(gpl_files)
        address@hidden -d $@ ] || $(MKDIR) --parents $@
        address@hidden(MAKETARGET)
 
-% :: $(build_directory) ; @:
+% :: $(build_dir) ; @:
 
 
################################################################################
 
@@ -389,7 +389,7 @@ raze: clobber
 
 # Custom tools built from source.
 
-TEST_CODING_RULES := $(build_directory)/test_coding_rules$(EXEEXT)
+TEST_CODING_RULES := $(build_dir)/test_coding_rules$(EXEEXT)
 
 .PHONY: custom_tools
 custom_tools:
@@ -400,7 +400,7 @@ custom_tools:
 
 # Check conformity to certain formatting rules; count lines and defects.
 #
-# The tests in $(build_directory) identify object ('.o') files with no
+# The tests in $(build_dir) identify object ('.o') files with no
 # corresponding autodependency ('.d') file, and zero-byte '.d' files.
 # Either of these suggests a build failure that may render dependency
 # files invalid; 'make clean' should provide symptomatic relief.
@@ -432,8 +432,8 @@ check_concinnity: source_clean custom_tools
        @[ -f md5sums ] \
          && <md5sums $(SED) 
-e'/\.test$$\|\.test0$$\|\.test1$$\|\.tsv$$\|\.xml$$/d' \
          | $(MD5SUM) --check --quiet || true
-       @for z in $(build_directory)/*.d; do [ -s $$z ]         || echo $$z; 
done;
-       @for z in $(build_directory)/*.o; do [ -f $${z%%.o}.d ] || echo $$z; 
done;
+       @for z in $(build_dir)/*.d; do [ -s $$z ]         || echo $$z; done;
+       @for z in $(build_dir)/*.o; do [ -f $${z%%.o}.d ] || echo $$z; done;
        @$(LS) --classify ./* \
          | $(SED) -e'/\*$$/!d' -e'/^\.\//!d' -e'/.sh\*$$/d' -e'/.sed\*$$/d' \
          | $(SED) -e's/^/Improperly executable: /'