diff options
author | Roland McGrath <roland@gnu.org> | 2003-02-22 21:47:19 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2003-02-22 21:47:19 +0000 |
commit | 7a0c303ef9fa96ba94df4a63be15f308000c899b (patch) | |
tree | 3fb8c20baa814549754a726921a4d20d5559ce50 | |
parent | cc8bfce987bcc8ece8a193fc1a5ee3831dbe32c9 (diff) | |
download | glibc-7a0c303ef9fa96ba94df4a63be15f308000c899b.tar glibc-7a0c303ef9fa96ba94df4a63be15f308000c899b.tar.gz glibc-7a0c303ef9fa96ba94df4a63be15f308000c899b.tar.bz2 glibc-7a0c303ef9fa96ba94df4a63be15f308000c899b.zip |
* Makerules: Fix last change to use $($(subdir)-version) when set.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makerules | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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. @@ -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. |