[lmi-commits] [lmi] master 2d86f7e 3/4: Revert "Install gcc runtime libraries before building default targets"

[Greg Chicares]

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

    Revert "Install gcc runtime libraries before building default targets"
    
    This reverts commit a06270feeb7973a7f1e0c2374de5fbb545e86bb6, which the
    last commit before the present one rendered unnecessary. See:
      https://lists.nongnu.org/archive/html/lmi/2019-04/msg00042.html
---
 workhorse.make | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index 79a30c5..f89fe50 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1056,22 +1056,19 @@ data_files := \
 help_files := \
   $(wildcard $(addprefix $(srcdir)/,*.html)) \
 
-.PHONY: preinstall
-preinstall:
-       @[ -z "$(compiler_runtime_files)" ] \
-         || $(CP) --preserve --update $(compiler_runtime_files) $(localbindir)
-
 .PHONY: install
-install: preinstall $(default_targets)
+install: $(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 $(default_targets) $(bindir)
+       @$(CP) --preserve --update $^ $(bindir)
        @$(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 --update $(compiler_runtime_files) 
/opt/lmi/local/bin
 ifeq (,$(USE_SO_ATTRIBUTES))
        @cd $(datadir); $(PERFORM) $(bindir)/product_files$(EXEEXT)
 else