external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix make install for VPATH builds. 

copy_to_distributed_table is in the source, not the build directory. As
there might be scripts in either at some point, install scripts from
both.
pull/340/head
Andres Freund 2016-02-11 10:10:08 +01:00 committed by Jason Petersen
parent 9e944fbcfc
commit 0a1c8723c4
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.global.in
View File

@ -19,6 +19,9 @@ vpath_build=@vpath_build@
ifeq ($(vpath_build),yes) ifeq ($(vpath_build),yes)
VPATH:=$(citus_abs_srcdir) VPATH:=$(citus_abs_srcdir)
USE_VPATH:=$(VPATH) USE_VPATH:=$(VPATH)
citus_top_srcdir:=$(citus_abs_top_srcdir)
else
citus_top_srcdir:=$(citus_top_builddir)
endif endif
# Citus is built using PostgreSQL's pgxs # Citus is built using PostgreSQL's pgxs

3
src/backend/distributed/Makefile
View File

@ -7,7 +7,8 @@ MODULE_big = citus
EXTENSION = citus EXTENSION = citus
EXTVERSION = 5.0 EXTVERSION = 5.0
DATA_built = $(EXTENSION)--$(EXTVERSION).sql DATA_built = $(EXTENSION)--$(EXTVERSION).sql
SCRIPTS = $(wildcard $(citus_top_builddir)/src/bin/scripts/*) # Install scripts in build and/or source directory, but only once if those are the same
SCRIPTS = $(sort $(wildcard $(citus_top_builddir)/src/bin/scripts/* $(citus_top_srcdir)/src/bin/scripts/*))
# directories with source files # directories with source files
SUBDIRS = . commands executor master planner relay test utils worker SUBDIRS = . commands executor master planner relay test utils worker