diff options
| author | lloyd <[email protected]> | 2011-05-12 12:56:46 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-05-12 12:56:46 +0000 |
| commit | d75753b365350bd2e330aecdd98abc89f73fca23 (patch) | |
| tree | 29e312a163060986d3b2b40d2ef6830904f503f1 /src/build-data/makefile | |
| parent | 4cf2e6a56d58547d241fb8cc42a95924add97665 (diff) | |
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.
Diffstat (limited to 'src/build-data/makefile')
| -rw-r--r-- | src/build-data/makefile/unix.in | 5 | ||||
| -rw-r--r-- | src/build-data/makefile/unix_shr.in | 9 |
2 files changed, 8 insertions, 6 deletions
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) |