File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -11,12 +11,13 @@ OBJS = pg_shardman.o
11
11
PGFILEDESC = "pg_shardman - sharding for Postgres"
12
12
13
13
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST ) ) ) # abs path to this makefile
14
- mkfile_dir := $(shell basename $(dir $(mkfile_path ) ) ) # parent dir of the project
14
+ mkfile_dir := $(shell basename $(shell dirname $( dir $(mkfile_path ) ) ) ) # parent dir of the project
15
15
ifndef USE_PGXS # hmm, user didn't requested to use pgxs
16
- ifneq ($(mkfile_dir ) ,contrib) # a-ha, but we are not inside 'contrib' dir
17
- USE_PGXS := 1 # so use it anyway, most probably that's use user wants
16
+ ifneq ($(strip $( mkfile_dir ) ) ,contrib) # a-ha, but we are not inside 'contrib' dir
17
+ USE_PGXS := 1 # so use it anyway, most probably that's what the user wants
18
18
endif
19
19
endif
20
+ $(info $$USE_PGXS is [${USE_PGXS}] (we use it automatically if not in contrib dir))
20
21
21
22
ifdef USE_PGXS # use pgxs
22
23
# You can specify path to pg_config in PG_CONFIG var
You can’t perform that action at this time.
0 commit comments