Commitd7085f2

committed

Make the makefile pass $MAJORVERSION to genbki.pl, not $VERSION which is

overridden in the snapshot build script. $MAJORVERSION is what it reallywanted anyway, so we can tighten up the parsing of --set-version's argument.

1 parentf883e20 commitd7085f2Copy full SHA for d7085f2

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for backend/catalog`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.75 2010/01/05 01:06:56 tgl Exp $`
	`5`	`+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.76 2010/01/06 19:56:29 tgl Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -55,7 +55,7 @@ postgres.shdescription: postgres.bki ;`
`55`	`55`	`schemapg.h: postgres.bki ;`
`56`	`56`
`57`	`57`	`postgres.bki: genbki.pl Catalog.pm$(POSTGRES_BKI_SRCS)`
`58`		`-$(PERL) -I$(catalogdir)$<$(pg_includes) --set-version=$(VERSION)$(POSTGRES_BKI_SRCS)`
	`58`	`+$(PERL) -I$(catalogdir)$<$(pg_includes) --set-version=$(MAJORVERSION)$(POSTGRES_BKI_SRCS)`
`59`	`59`
`60`	`60`	`.PHONY: install-data`
`61`	`61`	`install-data:$(BKIFILES) installdirs`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`11`	`11`	`# Portions Copyright (c) 1994, Regents of the University of California`
`12`	`12`	`#`
`13`		`-# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.4 2010/01/05 20:23:32 tgl Exp $`
	`13`	`+# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.5 2010/01/06 19:56:29 tgl Exp $`
`14`	`14`	`#`
`15`	`15`	`#----------------------------------------------------------------------`
`16`	`16`
`@@ -40,7 +40,7 @@`
`40`	`40`	`{`
`41`	`41`	`push@include_path,length($arg) > 2 ?substr($arg, 2) :shift@ARGV;`
`42`	`42`	`}`
`43`		`-elsif ($arg =~/^--set-version=(\d+\.\d+).*$/)`
	`43`	`+elsif ($arg =~/^--set-version=(\d+\.\d+)$/)`
`44`	`44`	`{`
`45`	`45`	`$major_version =$1;`
`46`	`46`	`}`

Comments

(0)