diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makerules | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d702a0a3b8..656b16893f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-08-22 Mike Frysinger <vapier@gentoo.org> + + * Makerules (lib-version): Rename from V. + (install-lib-nosubdir): Change V to lib-version. + 2012-08-22 Will Schmidt <will_schmidt@vnet.ibm.com> [BZ #14252] diff --git a/Makerules b/Makerules index 685b1b86c6..1281b9446a 100644 --- a/Makerules +++ b/Makerules @@ -841,11 +841,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)) +lib-version := $(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=)-$V.so \ + $(inst_slibdir)/$(L:.so=)-$(lib-version).so \ $(inst_slibdir)/$L$($L-version)) # Install all the unversioned shared libraries. |