From 68dfdefdf775275704bfefb3d111307974bf1d1e Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sat, 17 Jan 2015 17:29:43 +0100 Subject: [PATCH] bdr: Fix build logic to work in spite of pg vpath logic changes. e907997f42faada60e5a26b116cc0b79b69309d1 broke bdr VPATH builds. --- Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index eb41c8b2ee..7713f45c74 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,9 +63,10 @@ bdr_abs_srcdir := @srcdir@ PG_CONFIG :=@PG_CONFIG@ PGXS := $(shell $(PG_CONFIG) --pgxs) +VPATH=$(bdr_abs_srcdir) USE_VPATH=$(bdr_abs_srcdir) -GIT_WORK_TREE=$(USE_VPATH) -GIT_DIR=$(USE_VPATH)/.git +GIT_WORK_TREE=$(VPATH) +GIT_DIR=$(VPATH)/.git export GIT_DIR export GIT_WORK_TREE @@ -78,7 +79,7 @@ Makefile: Makefile.in $(shell pwd)/config.status ./config.status $@ DATE=$(shell date "+%Y-%m-%d") -GITHASH=$(shell if [ -e .distgitrev ]; then cat .distgitrev; else GIT_DIR=$(USE_VPATH)/.git git rev-parse --short HEAD; fi) +GITHASH=$(shell if [ -e .distgitrev ]; then cat .distgitrev; else GIT_DIR=$(VPATH)/.git git rev-parse --short HEAD; fi) BDR_VERSION=$(shell awk '/^\#define BDR_VERSION / { print $3; }' ${bdr_abs_srcdir}/bdr_version.h.in | cut -d '"' -f 2) bdr_version.h: ${bdr_abs_srcdir}/bdr_version.h.in -- 2.39.5