Modify soname to match Unix conventions at suggestion of Debian

maintainer.

Namespace the headers in /usr/local/include/botan-1.9/botan, so
multiple versions can be installed in parallel.

Down version to 1.9.18 since there are a good number of changes in
this release already.

4 files changed, 13 insertions, 11 deletions

diff --git a/src/build-data/botan-config.in b/src/build-data/botan-config.in
index f3fa3db94..6780c12b8 100644
--- a/src/build-data/botan-config.in
+++ b/src/build-data/botan-config.in
@@ -2,7 +2,7 @@
 
 # For normal builds:
 guess_prefix=`dirname \`dirname $0\``
-includedir=%{includedir}
+includedir=%{includedir}/botan-%{version_major}.%{version_minor}
 libdir=%{libdir}
 
 #  For workspace builds:
@@ -54,9 +54,9 @@ while test $# -gt 0; do
     --libs)
         if [ $prefix != "/usr" -a $prefix != "/usr/local" ]
         then
-           echo -L$prefix/$libdir -lbotan %{link_to}
+           echo -L$prefix/$libdir -lbotan-%{version_major}.%{version_minor} %{link_to}
         else
-           echo -lbotan %{link_to}
+           echo -lbotan-%{version_major}.%{version_minor} %{link_to}
         fi
         ;;
     *)
diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
index 70ed65d70..301f84600 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
+includedir=${prefix}/include/botan-%{version_major}.%{version_minor}
 
 Name: Botan
 Description: Multi-platform C++ crypto library
 Version: %{version}
 
-Libs: -L${libdir} -lbotan
+Libs: -L${libdir} -lbotan-%{version_major}.%{version_minor}
 Libs.private: %{link_to}
 Cflags: -I${includedir}
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index 1a1128f81..021a11b35 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -9,13 +9,14 @@ LINK_TO       = %{link_to}
 
 # Version Numbers
 VERSION       = %{version}
+SERIES        = %{version_major}.%{version_minor}
 
 # Installation Settings
 DESTDIR       = %{prefix}
 
 BINDIR        = $(DESTDIR)/bin
 LIBDIR        = $(DESTDIR)/%{libdir}
-HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+HEADERDIR     = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
 DOCDIR        = $(DESTDIR)/%{docdir}/botan-$(VERSION)
 PKGCONF_DIR   = $(LIBDIR)/pkgconfig
 
@@ -52,7 +53,7 @@ CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 LIBRARIES     = $(STATIC_LIB)
 
 LIBNAME       = %{lib_prefix}libbotan
-STATIC_LIB    = $(LIBNAME).a
+STATIC_LIB    = $(LIBNAME)-$(SERIES).a
 
 all: $(LIBRARIES)
 
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index c311d9924..3a3cef8a7 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -11,13 +11,14 @@ LINK_TO       = %{link_to}
 
 # Version Numbers
 VERSION       = %{version}
+SERIES        = %{version_major}.%{version_minor}
 
 # Installation Settings
 DESTDIR       = %{prefix}
 
 BINDIR        = $(DESTDIR)/bin
 LIBDIR        = $(DESTDIR)/%{libdir}
-HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+HEADERDIR     = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
 DOCDIR        = $(DESTDIR)/%{docdir}/botan-$(VERSION)
 PKGCONF_DIR   = $(LIBDIR)/pkgconfig
 
@@ -54,12 +55,12 @@ CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 LIBRARIES     = $(STATIC_LIB) $(SHARED_LIB)
 
 LIBNAME       = %{lib_prefix}libbotan
-STATIC_LIB    = $(LIBNAME).a
+STATIC_LIB    = $(LIBNAME)-$(SERIES).a
 
-SONAME        = $(LIBNAME)-%{version_major}.%{version_minor}.%{so_suffix}
+SONAME        = $(LIBNAME)-$(SERIES).%{so_suffix}.%{so_abi_rev}
 SHARED_LIB    = $(SONAME).%{version_patch}
 
-SYMLINK       = libbotan.%{so_suffix}
+SYMLINK       = $(LIBNAME)-$(SERIES).%{so_suffix}
 
 all: $(LIBRARIES)