* Makerules (install-lib-nosubdir): Depend on installed
authorRoland McGrath <roland@gnu.org>
Sat, 22 Feb 2003 20:32:58 +0000 (20:32 +0000)
committerRoland McGrath <roland@gnu.org>
Sat, 22 Feb 2003 20:32:58 +0000 (20:32 +0000)
libfoo-X.Y.Z.so and libfoo.so.NN files so they are installed
regardless of the libfoo.so target's dependencies.

ChangeLog
Makerules

index 4085dee..e278ef3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-02-22  Roland McGrath  <roland@redhat.com>
 
+       * Makerules (install-lib-nosubdir): Depend on installed
+       libfoo-X.Y.Z.so and libfoo.so.NN files so they are installed
+       regardless of the libfoo.so target's dependencies.
+
        * MakeTAGS (sub-make-vars): New variable, includes generating=t.
        Use that in $(MAKE) calls.
 
index ef608c2..a99d566 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -872,8 +872,15 @@ versioned := $(strip $(foreach so,$(install-lib.so),\
 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
 
-install-lib-nosubdir: $(install-lib.so-versioned:%=$(inst_libdir)/%) \
-                     $(install-lib.so-unversioned:%=$(inst_slibdir)/%)
+# For versioned libraries, we install three files:
+#      $(inst_libdir)/libfoo.so        -- for linking, symlink or ld script
+#      $(inst_slibdir)/libfoo.so.NN    -- for loading by SONAME, symlink
+#      $(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file
+install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \
+                     $(foreach L,$(install-lib.so-versioned),\
+                               $(inst_libdir)/$L \
+                               $(inst_slibdir)/$(L:.so=)-$(version).so \
+                               $(inst_slibdir)/$L$($L-version))
 
 # Install all the unversioned shared libraries.
 $(install-lib.so-unversioned:%=$(inst_slibdir)/%): $(inst_slibdir)/%.so: \