summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makerules3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e278ef3636..e5a2f8a304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2003-02-22 Roland McGrath <roland@redhat.com>
+ * Makerules: Fix last change to use $($(subdir)-version) when set.
+
* 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.
diff --git a/Makerules b/Makerules
index a99d566388..c4a28ae8bd 100644
--- a/Makerules
+++ b/Makerules
@@ -876,10 +876,11 @@ install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
# $(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
+V := $(firstword $($(subdir)-version) $(version))
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:.so=)-$V.so \
$(inst_slibdir)/$L$($L-version))
# Install all the unversioned shared libraries.