From b14cf229f4bd7238be2e31d873dc5dd241d3871e Mon Sep 17 00:00:00 2001 From: Tom Lane <tgl@sss.pgh.pa.us> Date: Sun, 17 May 2015 20:04:42 -0400 Subject: [PATCH] Use += not = to set makefile variables after including base makefiles. The previous coding in hstore_plpython and ltree_plpython wiped out any values set by the base makefiles. This at least had the effect of running the tests in "regression" not "contrib_regression" as expected. These being pretty new modules, there might be other bad effects we'd not noticed yet. --- contrib/hstore_plpython/Makefile | 4 ++-- contrib/ltree_plpython/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile index 6125ea4d2cf..6ee434bafa8 100644 --- a/contrib/hstore_plpython/Makefile +++ b/contrib/hstore_plpython/Makefile @@ -28,10 +28,10 @@ ifeq ($(PORTNAME), win32) SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a) endif -REGRESS_OPTS = --load-extension=hstore +REGRESS_OPTS += --load-extension=hstore ifeq ($(python_majorversion),2) REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu endif -EXTRA_INSTALL = contrib/hstore +EXTRA_INSTALL += contrib/hstore include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile index a0c107c2c32..64ca1275f1c 100644 --- a/contrib/ltree_plpython/Makefile +++ b/contrib/ltree_plpython/Makefile @@ -28,10 +28,10 @@ ifeq ($(PORTNAME), win32) SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) endif -REGRESS_OPTS = --load-extension=ltree +REGRESS_OPTS += --load-extension=ltree ifeq ($(python_majorversion),2) REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu endif -EXTRA_INSTALL = contrib/ltree +EXTRA_INSTALL += contrib/ltree include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk -- GitLab