From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 26 Apr 2015 00:57:58 +0000 (-0400)
Subject: Don't overwrite EXTRA_INSTALL
X-Git-Tag: REL9_5_ALPHA1~395
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee8d392765f29b1b8adb52f75008e301823f094b;p=postgresql

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.
---

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index ea17b1c185..08e25da723 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