[lmi-commits] [lmi] master a06270f 3/3: Install gcc runtime libraries before building default targets

[Greg Chicares]

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

    Install gcc runtime libraries before building default targets
    
    See:
      http://lists.nongnu.org/archive/html/lmi/2017-08/msg00042.html
---
 workhorse.make | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index 69515f1..8a32971 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -893,18 +893,21 @@ data_files := \
 help_files := \
   $(wildcard $(addprefix $(srcdir)/,*.html)) \
 
+.PHONY: preinstall
+preinstall:
+       @[ -z "$(compiler_runtime_files)" ] \
+         || $(CP) --preserve --update $(compiler_runtime_files) 
/opt/lmi/local/bin
+
 .PHONY: install
-install: $(default_targets)
+install: preinstall $(default_targets)
        address@hidden -d $(exec_prefix)    ] || $(MKDIR) --parents 
$(exec_prefix)
        address@hidden -d $(bindir)         ] || $(MKDIR) --parents $(bindir)
        address@hidden -d $(datadir)        ] || $(MKDIR) --parents $(datadir)
        address@hidden -d $(test_dir)       ] || $(MKDIR) --parents $(test_dir)
        address@hidden -d $(touchstone_dir) ] || $(MKDIR) --parents 
$(touchstone_dir)
-       @$(CP) --preserve --update $^ $(bindir)
+       @$(CP) --preserve --update $(default_targets) $(bindir)
        @$(CP) --preserve --update $(data_files) $(datadir)
        @$(CP) --preserve --update $(help_files) $(datadir)
-       @[ -z "$(compiler_runtime_files)" ] \
-         || $(CP) --preserve --update $(compiler_runtime_files) 
/opt/lmi/local/bin
 ifeq (,$(USE_SO_ATTRIBUTES))
        @cd $(datadir); $(PERFORM) $(bindir)/product_files$(EXEEXT)
 else