Add LD option --build-id only at RPM-build time

[pghintplan/pg_hint_plan.git] / Makefile

diff --git a/Makefile b/Makefile
index 92e7806..3e27311 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 #
 # pg_hint_plan: Makefile
 #
-# Copyright (c) 2012-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+# Copyright (c) 2012-2021, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 #
 
 MODULES = pg_hint_plan
-HINTPLANVER = 1.3.5
+HINTPLANVER = 1.4
 
 REGRESS = init base_plan pg_hint_plan ut-init ut-A ut-S ut-J ut-L ut-G ut-R ut-fdw ut-W ut-T ut-fini
 
@@ -18,12 +18,24 @@ DATA = pg_hint_plan--*.sql
 
 EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out RPMS
 
+# Switch environment between standalone make and make check with
+# EXTRA_INSTALL from PostgreSQL tree
+# run the following command in the PG tree to run a regression test
+# loading this module.
+# $ make check EXTRA_INSTALL=<this directory> EXTRA_REGRESS_OPTS="--temp-config <this directory>/pg_hint_plan.conf"
+ifeq ($(wildcard $(DESTDIR)/../src/Makefile.global),)
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+else
+subdir = `pwd`
+top_builddir = $(DESTDIR)/..
+include $(DESTDIR)/../src/Makefile.global
+include $(DESTDIR)/../contrib/contrib-global.mk
+endif
 
-STARBALL12 = pg_hint_plan12-$(HINTPLANVER).tar.gz
-STARBALLS = $(STARBALL12)
+STARBALL14 = pg_hint_plan14-$(HINTPLANVER).tar.gz
+STARBALLS = $(STARBALL14)
 
 TARSOURCES = Makefile *.c  *.h COPYRIGHT* \
        pg_hint_plan--*.sql \
@@ -31,13 +43,9 @@ TARSOURCES = Makefile *.c  *.h COPYRIGHT* \
        doc/* expected/*.out sql/*.sql sql/maskout.sh \
        data/data.csv input/*.source output/*.source SPECS/*.spec
 
-ifneq ($(shell uname), SunOS)
-LDFLAGS+=-Wl,--build-id
-endif
-
 installcheck: $(REGRESSION_EXPECTED)
 
-rpms: rpm12
+rpms: rpm14
 
 # pg_hint_plan.c includes core.c and make_join_rel.c
 pg_hint_plan.o: core.c make_join_rel.c # pg_stat_statements.c
@@ -52,7 +60,5 @@ $(STARBALLS): $(TARSOURCES)
        tar -chzf $@ $(addprefix $(subst .tar.gz,,$@)/, $^)
        rm $(subst .tar.gz,,$@)
 
-rpm12: $(STARBALL12)
-       MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_hint_plan12.spec
-
-
+rpm14: $(STARBALL14)
+       MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_hint_plan14.spec