Squashed 'contrib/pg_shardman/' changes from 302fd15..c350eaf

c350eaf Use PGXS always, except when we are inside 'contrib' directory.

git-subtree-dir: contrib/pg_shardman
git-subtree-split: c350eaf

Author: arssher

Makefile

@@ -10,27 +10,34 @@ MODULE_big = pg_shardman
 OBJS = pg_shardman.o
 PGFILEDESC = "pg_shardman - sharding for Postgres"
 
-ifdef USE_SOURCETREE # assume the extension is in contrib/ dir of pg distribution
-PG_CPPFLAGS = -I$(libpq_srcdir)
-SHLIB_LINK = $(libpq)
-SHLIB_PREREQS = submake-libpq
-subdir = contrib/pg_shardman
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-else # use pgxs
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) # abs path to this makefile
+mkfile_dir := $(shell basename $(dir $(mkfile_path))) # parent dir of the project
+ifndef USE_PGXS # hmm, user didn't requested to use pgxs
+ifneq ($(mkfile_dir),contrib) # a-ha, but we are not inside 'contrib' dir
+USE_PGXS := 1 # so use it anyway, most probably that's use user wants
+endif
+endif
+
+ifdef USE_PGXS # use pgxs
 # You can specify path to pg_config in PG_CONFIG var
 ifndef PG_CONFIG
 	PG_CONFIG := pg_config
 endif
 PG_CONFIG = pg_config
-
 INCLUDEDIR := $(shell $(PG_CONFIG) --includedir)
 PG_CPPFLAGS += -I$(INCLUDEDIR) # add server's include directory for libpq-fe.h
 SHLIB_LINK += -lpq # add libpq
-
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+
+else # assume the extension is in contrib/ dir of pg distribution
+PG_CPPFLAGS = -I$(libpq_srcdir) # include libpq-fe, defined in Makefile.global.in
+SHLIB_LINK = $(libpq) # defined in Makefile.global.in
+SHLIB_PREREQS = submake-libpq
+subdir = contrib/pg_shardman
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
 python_tests: