cleanup Makefile

alubennikova · alubennikova · commit 41bdaf64e18f · 2017-06-15T16:54:29.000+03:00
diff --git a/Makefile b/Makefile
@@ -30,27 +30,24 @@ all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_probackup
 
 MAKE_GLOBAL="../../src/Makefile.global"
 TEST_GLOBAL:=$(shell test -e ../../src/Makefile.global)
-ifeq ($(.SHELLSTATUS),1)
+
+ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-
-.PHONY: checksrcdir
-checksrcdir:
 ifndef top_srcdir
 	@echo "You must have PostgreSQL source tree available to compile."
 	@echo "Pass the path to the PostgreSQL source tree to make, in the top_srcdir"
 	@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
 	@exit 1
 endif
 else
-#TODO: fix me
-REGRESS =
 subdir=contrib/pg_probackup
 top_builddir=../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
 PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS) $(PG_CPPFLAGS)
 PG_LIBS = $(libpq_pgport) ${PTHREAD_CFLAGS}
