NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitb58233c

committed

Fix PGXS vpath build when PostgreSQL is built with vpath

PGXS computes srcdir from VPATH, PostgreSQL proper computes VPATH fromsrcdir, and doing both results in an error from make. Conditionalize soonly one of these takes effect.

1 parente4b5a07 commitb58233cCopy full SHA for b58233c

File tree

1 file changed

-0

lines changed

src
- Makefile.global.in

1 file changed

-0

lines changed

`‎src/Makefile.global.in`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ VERSION = @PACKAGE_VERSION@`
`40`	`40`	`MAJORVERSION = @PG_MAJORVERSION@`
`41`	`41`
`42`	`42`	`# Support for VPATH builds`
	`43`	`+# (PGXS VPATH support is handled separately in pgxs.mk)`
	`44`	`+ifndefPGXS`
`43`	`45`	`vpath_build = @vpath_build@`
`44`	`46`	`abs_top_srcdir = @abs_top_srcdir@`
`45`	`47`
`@@ -51,6 +53,7 @@ top_srcdir = $(abs_top_srcdir)`
`51`	`53`	`srcdir =$(top_srcdir)/$(subdir)`
`52`	`54`	`VPATH =$(srcdir)`
`53`	`55`	`endif`
	`56`	`+endif# not PGXS`
`54`	`57`
`55`	`58`	vpathsearch =`for fin$(addsuffix /$(1),$(subst :, ,.$(VPATH)));dotest -r$$f&&echo$$f&&break; done`
`56`	`59`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb58233c

File tree

1 file changed

1 file changed

`‎src/Makefile.global.in`

0 commit comments