17 files changed, 33 insertions, 16 deletions
diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
index 49d7cfb59..85943ab3f 100644
--- a/src/build-data/botan.pc.in
+++ b/src/build-data/botan.pc.in
@@ -1,12 +1,12 @@
 prefix=%{prefix}
 exec_prefix=${prefix}
 libdir=${prefix}/%{libdir}
-includedir=${prefix}/include/botan-%{version_major}.%{version_minor}
+includedir=${prefix}/include/botan-%{version_major}
 
 Name: Botan
 Description: Crypto and TLS for C++11
 Version: %{version}
 
-Libs: -L${libdir} -lbotan-%{version_major}.%{version_minor}
+Libs: -L${libdir} -lbotan-%{version_major}
 Libs.private: %{link_to}
 Cflags: -I${includedir}
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index de417ce90..70c37d39a 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 gettimeofday
 threads
diff --git a/src/build-data/os/android.txt b/src/build-data/os/android.txt
index 64a639909..50d97fd8f 100644
--- a/src/build-data/os/android.txt
+++ b/src/build-data/os/android.txt
@@ -1,8 +1,6 @@
 os_type unix
 
-soname_pattern_base  "libbotan-{version_major}.{version_minor}.so"
-soname_pattern_abi   "libbotan-{version_major}.{version_minor}.so.{abi_rev}"
-soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}"
+soname_suffix "so"
 
 <target_features>
 clock_gettime
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index 662101b1c..a27259876 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -1,8 +1,8 @@
 os_type unix
 
-soname_pattern_base  "libbotan-{version_major}.{version_minor}.dylib"
-soname_pattern_abi   "libbotan-{version_major}.{version_minor}.{abi_rev}.dylib"
-soname_pattern_patch "libbotan-{version_major}.{version_minor}.{abi_rev}.{version_patch}.dylib"
+soname_pattern_base  "libbotan-{version_major}.dylib"
+soname_pattern_abi   "libbotan-{version_major}.{abi_rev}.dylib"
+soname_pattern_patch "libbotan-{version_major}.{abi_rev}.{version_minor}.{version_patch}.dylib"
 
 # It doesn't have the 's' option; you need to use needs ranlib
 ar_command "ar cr"
diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt
index 1ff2804b0..628ac7c98 100644
--- a/src/build-data/os/dragonfly.txt
+++ b/src/build-data/os/dragonfly.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 clock_gettime
 gettimeofday
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 326e6661a..0e60abd2e 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -1,8 +1,6 @@
 os_type unix
 
-soname_pattern_base  "libbotan-{version_major}.{version_minor}.so"
-soname_pattern_abi   "libbotan-{version_major}.{version_minor}.so.{abi_rev}"
-soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}"
+soname_suffix "so"
 
 <target_features>
 clock_gettime
diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt
index 9ad3f29f7..8b6f0641d 100644
--- a/src/build-data/os/haiku.txt
+++ b/src/build-data/os/haiku.txt
@@ -1,5 +1,6 @@
 os_type unix
 
+building_shared_supported no
 install_root /boot
 header_dir develop/headers
 lib_dir system/lib
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index 3f6f0d940..f8c2d0d2a 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -1,5 +1,8 @@
 os_type unix
 
+# It is "sl" on HP-PA, but HP-UX on PA is EOL
+soname_suffix "so"
+
 <target_features>
 gettimeofday
 threads
diff --git a/src/build-data/os/hurd.txt b/src/build-data/os/hurd.txt
index 35a65315d..846117805 100644
--- a/src/build-data/os/hurd.txt
+++ b/src/build-data/os/hurd.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 posix_mlock
 threads
diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt
index de417ce90..70c37d39a 100644
--- a/src/build-data/os/irix.txt
+++ b/src/build-data/os/irix.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 gettimeofday
 threads
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index cb6c75df9..6bd81f7f2 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -1,8 +1,6 @@
 os_type unix
 
-soname_pattern_base  "libbotan-{version_major}.{version_minor}.so"
-soname_pattern_abi   "libbotan-{version_major}.{version_minor}.so.{abi_rev}"
-soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}"
+soname_suffix "so"
 
 <target_features>
 clock_gettime
diff --git a/src/build-data/os/nacl.txt b/src/build-data/os/nacl.txt
index e2e2f34be..c24413618 100644
--- a/src/build-data/os/nacl.txt
+++ b/src/build-data/os/nacl.txt
@@ -1,4 +1,6 @@
 
+building_shared_supported no
+
 <target_features>
 gettimeofday
 threads
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index baf4b1a9c..4c82e6239 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 clock_gettime
 gettimeofday
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index 0e18eb8e1..0e60abd2e 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 clock_gettime
 gettimeofday
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index a2061594f..76a10f951 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -1,5 +1,8 @@
+# not really, but for our purposes
 os_type unix
 
+soname_suffix "so"
+
 <target_features>
 clock_gettime
 gettimeofday
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 1e740aea7..49962e82c 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -1,5 +1,7 @@
 os_type unix
 
+soname_suffix "so"
+
 install_cmd_data '/usr/ucb/install -m 644'
 install_cmd_exec '/usr/ucb/install -m 755'
 
diff --git a/src/python/botan.py b/src/python/botan.py
index 093359970..4da158285 100755
--- a/src/python/botan.py
+++ b/src/python/botan.py
@@ -27,9 +27,9 @@ import time
 Module initialization
 """
 if sys.platform == 'darwin':
-    botan = CDLL('libbotan-1.11.dylib')
+    botan = CDLL('libbotan-2.dylib')
 else:
-    botan = CDLL('libbotan-1.11.so')
+    botan = CDLL('libbotan-2.so')
 
 expected_api_rev = 20151015
 botan_api_rev = botan.botan_ffi_api_version()