From bd4a1d5ad1a72fa780a8b7fd6c365a5dad2e6220 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Thu, 19 Oct 2000 09:27:23 +0000
Subject: [PATCH] * automake.in (handle_merge_targets): Allow parallel install
 with forced relink.

---
 ChangeLog   |  5 +++++
 TODO        | 24 +++++++++++++++++++++++-
 automake.in |  5 +++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3cd91fe..aaed042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19  Alex Hornby  <alex@anvil.co.uk>
+
+	* automake.in (handle_merge_targets): Allow parallel install
+	with forced relink.
+
 2000-10-19  Akim Demaille  <akim@epita.fr>
 
 	* subdir4.test (depcomp): Don't create it, defs does.
diff --git a/TODO b/TODO
index 72e86f8..5bb7917 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,25 @@
+*
+    Alexandre Oliva:
+    > Hmm...  Interesting.  It must have been a side effect of the enabling
+    > of forced `relink' on GNU/Linux/x86.  Anyway, on platforms that
+    > actually require relinking, this problem remains, and I see no way to
+    > overcome it other than arranging for automake to install libraries
+    > before executables, as you suggest.  This shouldn't be a big problem,
+    > anyway.
+    >
+    > A bigger problem could show up if two libraries in the same directory,
+    > one dependent on the other, are installed concurrently.  If relinking
+    > is needed for the dependent library, we have a problem.  It appears to
+    > me that user will have to live without `make -j install', in this
+    > case.
+
+    Alex Hornby
+    > Here's an Automake patch and changelog entry allow make -j install on
+    > such degenerate systems (and Linux with buggy libtool <g>)
+    >
+    > If you install to locations other that bin_ and lib_ then a larger fix
+    > is necessary, but this should fix the 90% case.
+
 * in depend2.am, in specialization case, what if @SOURCE@ is found
   in srcdir?  We can't depend on $<!  We must search explicitly.
   this is a very serious problem!
@@ -296,7 +318,7 @@ Jim's idea: should look for @setfilename and warn if filenames too long
    Doing this requires rewriting macros before generating Makefile.in.
 
 from joerg-martin schwarz:
- -- If Makefile.am contains $(CC), $(COMPILE), $(YLWRAP), .... 
+ -- If Makefile.am contains $(CC), $(COMPILE), $(YLWRAP), ....
     in an explicitly written rule,  you should emit the corresponding
     Makefile variables automatically.
 
diff --git a/automake.in b/automake.in
index 5d8d91a..89d2619 100755
--- a/automake.in
+++ b/automake.in
@@ -3807,6 +3807,11 @@ sub handle_merge_targets
 	}
     }
 
+    if (&variable_defined('lib_LTLIBRARIES') && 
+	&variable_defined('bin_PROGRAMS'))
+    {
+	$output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
+    }
     # Print definitions users can use.
     &do_one_merge_target ('install-exec', @install_exec);
     $output_rules .= "\n";
-- 
2.7.4