[lmi-commits] [lmi] master 19c0946 13/18: Copy compiler runtime files in one makefile target only

[Greg Chicares]

branch: master
commit 19c09468c800ab2c7577c6de2411b165ae54410e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Copy compiler runtime files in one makefile target only
    
    * GNUmakefile: Copy runtime files not only to build directory (required
    for unit tests (historically, at least)), but also to local binary
    directory (which is on $PATH). Ensure that the latter target directory
    (and other required directories) exist beforehand. Removed a mkdir
    command hereby rendered needless.
    
    * workhorse.make: Remove command for precondition now ensured in
    'GNUmakefile'.
---
 GNUmakefile    | 11 +++++++----
 workhorse.make |  2 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 66780ee..074fc46 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -242,9 +242,13 @@ MAKETARGET = \
 
 .PHONY: $(build_dir)
 $(build_dir): $(gpl_files)
-       address@hidden -d $@ ] || $(MKDIR) --parents $@
-       address@hidden z in $(compiler_runtime_files); \
-         do $(CP) --archive --update $$z $@ ; \
+       address@hidden -d $@                 ] || $(MKDIR) --parents $@
+       address@hidden -d $(localbindir)     ] || $(MKDIR) --parents 
$(localbindir)
+       address@hidden -d $(locallibdir)     ] || $(MKDIR) --parents 
$(locallibdir)
+       address@hidden -d $(localincludedir) ] || $(MKDIR) --parents 
$(localincludedir)
+       address@hidden z in $(compiler_runtime_files); do \
+           $(CP) --archive --update $$z $@ ; \
+           $(CP) --archive --update $$z $(localbindir) ; \
          done;
        address@hidden(MAKETARGET)
 
@@ -406,7 +410,6 @@ TEST_CODING_RULES := $(build_dir)/test_coding_rules$(EXEEXT)
 .PHONY: custom_tools
 custom_tools:
        @$(MAKE) test_coding_rules$(EXEEXT)
-       @$(MKDIR) --parents $(localbindir)
        @$(CP) --preserve --update $(TEST_CODING_RULES) $(localbindir)
 
 
################################################################################
diff --git a/workhorse.make b/workhorse.make
index dc2584e..7bd2885 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1070,8 +1070,6 @@ install: $(default_targets)
        @$(CP) --preserve --update $(data_files) $(datadir)
        @$(CP) --preserve --update $(help_files) $(datadir)
        @datadir=$(datadir) srcdir=$(srcdir) $(srcdir)/mst_to_xst.sh
-       @[ -z "$(compiler_runtime_files)" ] \
-         || $(CP) --preserve $(compiler_runtime_files) $(localbindir)
 ifeq (,$(USE_SO_ATTRIBUTES))
        @cd $(datadir); $(PERFORM) $(bindir)/product_files$(EXEEXT)
 else