From 7a0c303ef9fa96ba94df4a63be15f308000c899b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 22 Feb 2003 21:47:19 +0000 Subject: [PATCH] * Makerules: Fix last change to use $($(subdir)-version) when set. --- ChangeLog | 2 ++ Makerules | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e278ef3..e5a2f8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-02-22 Roland McGrath + * 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 a99d566..c4a28ae 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. -- 2.7.4