* Makerules: Fix last change to use $($(subdir)-version) when set.

1 files changed, 2 insertions, 1 deletions

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.