From f8bc0913cfc2920db7dd9715543a9436539285d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Thu, 16 Sep 2021 12:31:41 +0100 Subject: [PATCH] ITS#9673 Strip release version from library name --- build/top.mk | 3 +-- build/version.sh | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/build/top.mk b/build/top.mk index 38ce146d77..ef08c067ac 100644 --- a/build/top.mk +++ b/build/top.mk @@ -73,9 +73,8 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@ MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)" LIBTOOL = @LIBTOOL@ -LIBRELEASE = @OPENLDAP_LIBRELEASE@ LIBVERSION = @OPENLDAP_LIBVERSION@ -LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION) +LTVERSION = -version-info $(LIBVERSION) # libtool --only flag for libraries: platform specific NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC) diff --git a/build/version.sh b/build/version.sh index 923518006d..799a33ca34 100755 --- a/build/version.sh +++ b/build/version.sh @@ -18,15 +18,12 @@ DIR=`dirname $0` if test $ol_patch != X ; then ol_version=${ol_major}.${ol_minor}.${ol_patch} - ol_api_lib_release=${ol_major}.${ol_minor} ol_type=Release elif test $ol_minor != X ; then ol_version=${ol_major}.${ol_minor}.${ol_patch} - ol_api_lib_release=${ol_major}.${ol_minor}.releng ol_type=Engineering else ol_version=${ol_major}.${ol_minor} - ol_api_lib_release=${ol_major}.devel ol_type=Devel fi @@ -38,7 +35,6 @@ echo OL_MAJOR=$ol_major echo OL_MINOR=$ol_minor echo OL_PATCH=$ol_patch echo OL_API_INC=$ol_api_inc -echo OL_API_LIB_RELEASE=$ol_api_lib_release echo OL_API_LIB_VERSION=$ol_api_lib_version echo OL_VERSION=$ol_version echo OL_TYPE=$ol_type