diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-07-05 12:01:01 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-07-05 12:01:01 -0400 |
| commit | 60c38e62cd15b1ad3f769f6d5ec37f98508bca28 (patch) | |
| tree | 84c0e8de92327134ebe59074d47caeb49140c135 | |
| parent | 4a1944ec6caf41f1008e86296fa8712ba8b59317 (diff) | |
| download | postgresql-60c38e62cd15b1ad3f769f6d5ec37f98508bca28.tar.gz postgresql-60c38e62cd15b1ad3f769f6d5ec37f98508bca28.zip | |
Make numeric form of PG version number readily available in Makefiles.
Expose PG_VERSION_NUM (e.g., "90600") as a Make variable; but for
consistency with the other Make variables holding similar info,
call the variable just VERSION_NUM not PG_VERSION_NUM.
There was some discussion of making this value available as a pg_config
value as well. However, that would entail substantially more work than
this two-line patch. Given that there was not exactly universal consensus
that we need this at all, let's just do a minimal amount of work for now.
Back-patch of commit a5d489ccb7e613c7ca3be6141092b8c1d2c13fa7, so that this
variable is actually useful for its intended purpose sometime before 2020.
Michael Paquier, reviewed by Pavel Stehule
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/Makefile.global.in | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure index b99c2594dcb..7832db758ed 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS vpath_build +PG_VERSION_NUM PROVE OSX XSLTPROC @@ -15056,6 +15057,7 @@ _ACEOF + # Begin output steps { $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5 diff --git a/configure.in b/configure.in index 03ca2ccbca5..543c3a4078b 100644 --- a/configure.in +++ b/configure.in @@ -2022,6 +2022,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR, tr '.' ' ' | $AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"] AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number]) +AC_SUBST(PG_VERSION_NUM) # Begin output steps diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 73a868384b1..aec6187af6d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -38,6 +38,7 @@ all: # PostgreSQL version number VERSION = @PACKAGE_VERSION@ MAJORVERSION = @PG_MAJORVERSION@ +VERSION_NUM = @PG_VERSION_NUM@ # Support for VPATH builds # (PGXS VPATH support is handled separately in pgxs.mk) |