summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-aux/ltmain.in9
-rw-r--r--m4/libtool.m42
2 files changed, 6 insertions, 5 deletions
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 714d0abd..a72c007c 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -6834,13 +6834,13 @@ func_mode_link ()
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
age=$number_minor
revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
+ freebsd-aout|qnx|sunos)
current=$number_major
revision=$number_minor
age=0
@@ -6926,8 +6926,9 @@ func_mode_link ()
;;
freebsd-elf)
- major=.$current
- versuffix=.$current
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 874cf245..da221393 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2543,7 +2543,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;