Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc786796

Browse files
committed
Fix computation of PG_VERSION_NUM by configure: remove unnecessary and
unportable backslashes in awk script (per Patrick Welche), and addbrackets to prevent autoconf from mangling sed's regexp (the sed callhere never did what was expected).
1 parent4303c0f commitc786796

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5271,9 +5271,9 @@ fi
52715271

52725272
# Supply a numeric version string for use by 3rd party add-ons
52735273
# awk -F is a regex on some platforms, and not on others, so make "." a tab
5274-
PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/A-Za-z.*$//' |
5274+
PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
52755275
tr '.' '' |
5276-
$AWK '{printf\"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`"
5276+
$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"
52775277

52785278
cat >>confdefs.h <<_ACEOF
52795279
#define PG_VERSION_NUM $PG_VERSION_NUM

‎configure.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.515 2007/06/04 21:55:43adunstan Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.516 2007/06/29 16:18:43tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -696,9 +696,9 @@ fi
696696

697697
# Supply a numeric version string for use by 3rd party add-ons
698698
# awk -F is a regex on some platforms, and not on others, so make "." a tab
699-
PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
699+
[PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
700700
tr '.' '' |
701-
$AWK '{printf\"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`"
701+
$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"]
702702
AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
703703

704704
##

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp