aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2020-03-10 12:46:07 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2020-03-10 12:46:07 -0400
commitdbf05a14399430751e54cd0b4bd8fb0e4f1fb309 (patch)
treece6c0af2e363d0842069fc0312e86c8f21a8a4eb
parentd01f03a495294f726001a90ec27a675428d9fc45 (diff)
downloadpostgresql-dbf05a14399430751e54cd0b4bd8fb0e4f1fb309.tar.gz
postgresql-dbf05a14399430751e54cd0b4bd8fb0e4f1fb309.zip
Avoid portability problem introduced in 0a42a2e9c.
Apparently not all shells handle nested quotes quite the same. But we don't need the inner double quotes in this case, so just drop them. Discussion: https://postgr.es/m/50ecb345-4dc5-1f7d-64ca-7018195fcc8d@2ndquadrant.com
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index d6d3f26d03d..1a0aca941bb 100755
--- a/configure
+++ b/configure
@@ -18887,7 +18887,7 @@ _ACEOF
# Supply a numeric version string for use by 3rd party add-ons
# awk -F is a regex on some platforms, and not on others, so make "." a tab
-PG_VERSION_NUM="`echo "$PG_MAJORVERSION $PG_MINORVERSION" |
+PG_VERSION_NUM="`echo $PG_MAJORVERSION $PG_MINORVERSION |
$AWK '{printf "%d%04d", $1, $2}'`"
cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 78902fb60db..b27708e336c 100644
--- a/configure.in
+++ b/configure.in
@@ -2322,7 +2322,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
# Supply a numeric version string for use by 3rd party add-ons
# awk -F is a regex on some platforms, and not on others, so make "." a tab
-[PG_VERSION_NUM="`echo "$PG_MAJORVERSION $PG_MINORVERSION" |
+[PG_VERSION_NUM="`echo $PG_MAJORVERSION $PG_MINORVERSION |
$AWK '{printf "%d%04d", $1, $2}'`"]
AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
AC_SUBST(PG_VERSION_NUM)