diff --git a/configure b/configure index 73ec2e65f4..d5a6d499c1 100755 --- a/configure +++ b/configure @@ -2875,12 +2875,12 @@ if test "${with_extra_version+set}" = set; then : as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5 ;; *) - PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)$withval" + PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION$withval" ;; esac else - PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)" + PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION" fi diff --git a/configure.ac b/configure.ac index ec33fa616d..bf155fa4b9 100644 --- a/configure.ac +++ b/configure.ac @@ -41,8 +41,8 @@ AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor vers AC_DEFINE_UNQUOTED(PG_PERCONAVERSION, "$PG_PERCONAVERSION", [PostgreSQL Percona version as a string]) PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version], - [PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)$withval"], - [PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)"]) + [PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION$withval"], + [PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION"]) AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string]) AC_CANONICAL_HOST diff --git a/meson.build b/meson.build index c8e5fcad4d..fe2a016f8d 100644 --- a/meson.build +++ b/meson.build @@ -145,7 +145,7 @@ cdata.set_quoted('PACKAGE_VERSION', pg_version) cdata.set_quoted('PACKAGE_STRING', 'PostgreSQL @0@'.format(pg_version)) cdata.set_quoted('PACKAGE_TARNAME', 'postgresql') -pg_version += '.' + pg_percona_ver + ' (Percona Server for PostgreSQL)' +pg_version += ' - Percona Server for PostgreSQL' + pg_version_major.to_string() + '.' + pg_version_minor.to_string() + '.' + pg_percona_ver pg_version += get_option('extra_version') cdata.set_quoted('PG_VERSION', pg_version) cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string())