From ee8d392765f29b1b8adb52f75008e301823f094b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 25 Apr 2015 20:57:58 -0400
Subject: [PATCH] Don't overwrite EXTRA_INSTALL

The temp-install target sets EXTRA_INSTALL to install the current
directory.  But when doing so, it should append instead of overwrite,
otherwise settings of EXTRA_INSTALL from a makefile won't take effect.
This would cause the earthdistance test to fail when called directly,
because it would miss installing the cube module.
---
 src/makefiles/pgxs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index ea17b1c1858..08e25da7231 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -294,7 +294,7 @@ else
 check: all submake $(REGRESS_PREP)
 	$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
 
-temp-install: EXTRA_INSTALL=$(subdir)
+temp-install: EXTRA_INSTALL+=$(subdir)
 endif
 endif # REGRESS
 
-- 
GitLab