Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb14cf22

Browse files
committed
Use += not = to set makefile variables after including base makefiles.
The previous coding in hstore_plpython and ltree_plpython wiped out anyvalues set by the base makefiles. This at least had the effect of runningthe tests in "regression" not "contrib_regression" as expected. Thesebeing pretty new modules, there might be other bad effects we'd notnoticed yet.
1 parenta0891d2 commitb14cf22

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎contrib/hstore_plpython/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ ifeq ($(PORTNAME), win32)
2828
SHLIB_LINK += ../hstore/libhstore.a$(wildcard ../../src/pl/plpython/libpython*.a)$(wildcard ../../src/pl/plpython/libplpython*.a)
2929
endif
3030

31-
REGRESS_OPTS = --load-extension=hstore
31+
REGRESS_OPTS+= --load-extension=hstore
3232
ifeq ($(python_majorversion),2)
3333
REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu
3434
endif
35-
EXTRA_INSTALL = contrib/hstore
35+
EXTRA_INSTALL+= contrib/hstore
3636

3737
include$(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk

‎contrib/ltree_plpython/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ ifeq ($(PORTNAME), win32)
2828
SHLIB_LINK +=$(wildcard ../../src/pl/plpython/libpython*.a)
2929
endif
3030

31-
REGRESS_OPTS = --load-extension=ltree
31+
REGRESS_OPTS+= --load-extension=ltree
3232
ifeq ($(python_majorversion),2)
3333
REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu
3434
endif
35-
EXTRA_INSTALL = contrib/ltree
35+
EXTRA_INSTALL+= contrib/ltree
3636

3737
include$(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp