From d7085f24064c63ce1b48ace459df842816afe94f Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 6 Jan 2010 19:56:29 +0000
Subject: [PATCH] Make the makefile pass $MAJORVERSION to genbki.pl, not
$VERSION which is overridden in the snapshot build script. $MAJORVERSION is
what it really wanted anyway, so we can tighten up the parsing of
--set-version's argument.
---
src/backend/catalog/Makefile | 4 ++--
src/backend/catalog/genbki.pl | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 7e75a99abd8..837865efbe5 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for backend/catalog
#
-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.75 2010/01/05 01:06:56 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.76 2010/01/06 19:56:29 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -55,7 +55,7 @@ postgres.shdescription: postgres.bki ;
schemapg.h: postgres.bki ;
postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS)
- $(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(VERSION) $(POSTGRES_BKI_SRCS)
+ $(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
.PHONY: install-data
install-data: $(BKIFILES) installdirs
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index 0f972822d3b..d1bed3afd26 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -10,7 +10,7 @@
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.4 2010/01/05 20:23:32 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.5 2010/01/06 19:56:29 tgl Exp $
#
#----------------------------------------------------------------------
@@ -40,7 +40,7 @@ while (@ARGV)
{
push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV;
}
- elsif ($arg =~ /^--set-version=(\d+\.\d+).*$/)
+ elsif ($arg =~ /^--set-version=(\d+\.\d+)$/)
{
$major_version = $1;
}
--
GitLab