database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Use += not = to set makefile variables after including base makefiles.

Browse Source 
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.
This commit is contained in:
Tom Lane
2015-05-17 20:04:42 -04:00
parent a0891d2d01
commit b14cf229f4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/hstore_plpython/Makefile
View File

@ -28,10 +28,10 @@ ifeq ($(PORTNAME), win32)
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a) SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
endif endif
REGRESS_OPTS = --load-extension=hstore REGRESS_OPTS += --load-extension=hstore
ifeq ($(python_majorversion),2) ifeq ($(python_majorversion),2)
REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu
endif endif
EXTRA_INSTALL = contrib/hstore EXTRA_INSTALL += contrib/hstore
include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk

4
contrib/ltree_plpython/Makefile
View File

@ -28,10 +28,10 @@ ifeq ($(PORTNAME), win32)
SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a)
endif endif
REGRESS_OPTS = --load-extension=ltree REGRESS_OPTS += --load-extension=ltree
ifeq ($(python_majorversion),2) ifeq ($(python_majorversion),2)
REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu
endif endif
EXTRA_INSTALL = contrib/ltree EXTRA_INSTALL += contrib/ltree
include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk