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.
This commit is contained in:
parent
f883e2007a
commit
d7085f2406
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# Makefile for backend/catalog
|
# 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 ;
|
schemapg.h: postgres.bki ;
|
||||||
|
|
||||||
postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS)
|
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
|
.PHONY: install-data
|
||||||
install-data: $(BKIFILES) installdirs
|
install-data: $(BKIFILES) installdirs
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||||
# Portions Copyright (c) 1994, Regents of the University of California
|
# 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;
|
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;
|
$major_version = $1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue