diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
index 11fa902bc67ce5bd7f6830e6fce144796b555c5e..6b018fdd5edf75ecd617f3c622e19afe4f0969eb 100644
--- a/contrib/btree_gist/Makefile
+++ b/contrib/btree_gist/Makefile
@@ -13,7 +13,7 @@ REGRESS     = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz t
               date interval macaddr inet cidr text varchar char bytea bit varbit numeric
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/btree_gist
diff --git a/contrib/chkpass/Makefile b/contrib/chkpass/Makefile
index 214cbad25db2fdc5ac245ac32e0c555fd07538c1..a9e8f2d91e5866c6dc1bc169213bc9955f1d86be 100644
--- a/contrib/chkpass/Makefile
+++ b/contrib/chkpass/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/chkpass/Makefile,v 1.6 2004/08/20 20:13:02 momjian Exp $
+# $PostgreSQL: pgsql/contrib/chkpass/Makefile,v 1.7 2005/09/27 17:13:00 tgl Exp $
 
 MODULE_big = chkpass
 OBJS = chkpass.o
@@ -7,7 +7,7 @@ DATA_built = chkpass.sql
 DOCS = README.chkpass
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/chkpass
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index dd953aae53df58375a358526d48f59476ac94d64..89dcb457284d49b164c7e7bcbc7409073b4ec932 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.13 2005/07/24 23:30:09 tgl Exp $
+# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.14 2005/09/27 17:13:00 tgl Exp $
 
 MODULE_big = cube
 OBJS= cube.o cubeparse.o
@@ -12,7 +12,7 @@ EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
 SHLIB_LINK += $(filter -lm, $(LIBS))
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/cube
diff --git a/contrib/dbase/Makefile b/contrib/dbase/Makefile
index f3dd96c831d1ed881e479b4387d8314740d58b99..898ec897e9881d025ee263b5cd6c037ea474b762 100644
--- a/contrib/dbase/Makefile
+++ b/contrib/dbase/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/dbase/Makefile,v 1.7 2005/03/25 18:17:10 momjian Exp $
+# $PostgreSQL: pgsql/contrib/dbase/Makefile,v 1.8 2005/09/27 17:13:01 tgl Exp $
 
 PROGRAM = dbf2pg
 OBJS	= dbf.o dbf2pg.o endian.o
@@ -16,7 +16,7 @@ MAN = dbf2pg.1			# XXX not implemented
 
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/dbase
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index 1719f5ea352e7aae28bb74ae653b332df3236863..8fa350807b7bd45cfdf9545cbfe9f20a952f2e2f 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.9 2004/08/20 20:13:03 momjian Exp $
+# $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.10 2005/09/27 17:13:01 tgl Exp $
 
 MODULE_big = dblink
 PG_CPPFLAGS = -I$(libpq_srcdir)
@@ -11,7 +11,7 @@ REGRESS = dblink
 
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/dblink
diff --git a/contrib/dbmirror/Makefile b/contrib/dbmirror/Makefile
index e21141342fa47bbbc3c67e01bd056b0d5a7a02e6..95dbb2a6fa538b59ed00f094fe37494d1cd75289 100644
--- a/contrib/dbmirror/Makefile
+++ b/contrib/dbmirror/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/dbmirror/Makefile,v 1.4 2004/11/04 06:09:19 neilc Exp $
+# $PostgreSQL: pgsql/contrib/dbmirror/Makefile,v 1.5 2005/09/27 17:13:01 tgl Exp $
 
 MODULES = pending
 SCRIPTS = clean_pending.pl DBMirror.pl
@@ -6,7 +6,7 @@ DATA = AddTrigger.sql MirrorSetup.sql slaveDatabase.conf
 DOCS = README.dbmirror
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/dbmirror
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index 8cb804ee19b9a0e9ed18da96418e8fbdb2fff5a2..b22653ff16608bc30af872bf8e11582f433fdab8 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.15 2005/07/24 23:30:09 tgl Exp $
+# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.16 2005/09/27 17:13:02 tgl Exp $
 
 MODULES = earthdistance
 DATA_built = earthdistance.sql
@@ -8,7 +8,7 @@ REGRESS = earthdistance
 SHLIB_LINK += $(filter -lm, $(LIBS))
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/earthdistance
diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile
index 8debfccc1f4f1ba3bc6e84e4d3e7359eecd5a921..981c91861afbe711ab25f20f08d468b6ab4ec0a4 100644
--- a/contrib/fulltextindex/Makefile
+++ b/contrib/fulltextindex/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/fulltextindex/Makefile,v 1.13 2004/08/20 20:13:04 momjian Exp $
+# $PostgreSQL: pgsql/contrib/fulltextindex/Makefile,v 1.14 2005/09/27 17:13:02 tgl Exp $
 
 MODULES = fti
 DATA_built = fti.sql
@@ -6,7 +6,7 @@ DOCS = README.fti
 SCRIPTS = fti.pl
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/fulltextindex
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
index 51e6c7b899d3e726dc39f2c124bf74efae53d7e5..97656547665497d32a4587a37c39c25704193b70 100644
--- a/contrib/fuzzystrmatch/Makefile
+++ b/contrib/fuzzystrmatch/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/fuzzystrmatch/Makefile,v 1.5 2004/08/20 20:13:04 momjian Exp $
+# $PostgreSQL: pgsql/contrib/fuzzystrmatch/Makefile,v 1.6 2005/09/27 17:13:03 tgl Exp $
 
 MODULE_big = fuzzystrmatch
 SRCS += fuzzystrmatch.c dmetaphone.c
@@ -7,7 +7,7 @@ DATA_built = fuzzystrmatch.sql
 DOCS = README.fuzzystrmatch README.soundex
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/fuzzystrmatch
diff --git a/contrib/intagg/Makefile b/contrib/intagg/Makefile
index c3b22d93b99c60ec643854cc45af5954c80fdcfb..fe14943997165fc8c66e2f1af3794489e4791953 100644
--- a/contrib/intagg/Makefile
+++ b/contrib/intagg/Makefile
@@ -2,14 +2,14 @@
 # Makefile for integer aggregator
 # Copyright (C) 2001 Digital Music Network.
 # by Mark L. Woodward
-# $PostgreSQL: pgsql/contrib/intagg/Makefile,v 1.5 2004/08/20 20:13:04 momjian Exp $
+# $PostgreSQL: pgsql/contrib/intagg/Makefile,v 1.6 2005/09/27 17:13:03 tgl Exp $
 
 MODULES = int_aggregate
 DATA_built = int_aggregate.sql
 DOCS = README.int_aggregate
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/intagg
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
index e5a310a1465dfda1e62568622810f079e334a9b7..17714b24cbcc01a388e133bea4ffe772770552fc 100644
--- a/contrib/intarray/Makefile
+++ b/contrib/intarray/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/intarray/Makefile,v 1.11 2004/08/20 20:13:04 momjian Exp $
+# $PostgreSQL: pgsql/contrib/intarray/Makefile,v 1.12 2005/09/27 17:13:04 tgl Exp $
 
 MODULE_big = _int
 OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o 
@@ -7,7 +7,7 @@ DOCS = README.intarray
 REGRESS = _int
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/intarray
diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile
index f82df97dd60fe77e18a508d6d3958c3661b70d42..2e900ba42d363cf1ee8c626bf5b25984bdf95fe8 100644
--- a/contrib/isbn_issn/Makefile
+++ b/contrib/isbn_issn/Makefile
@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/isbn_issn/Makefile,v 1.13 2004/08/20 20:13:04 momjian Exp $
+# $PostgreSQL: pgsql/contrib/isbn_issn/Makefile,v 1.14 2005/09/27 17:13:04 tgl Exp $
 
 MODULES = isbn_issn
 DATA_built = isbn_issn.sql
 DOCS = README.isbn_issn
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/isbn_issn
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index 17ac5008e17b3aa46b55a2cf91e0189ec9e46dce..c9a6becbde3fa5ce90260743c2bdf66bff8621b6 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.13 2004/08/20 20:13:05 momjian Exp $
+# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.14 2005/09/27 17:13:04 tgl Exp $
 
 MODULES = lo
 DATA_built = lo.sql
@@ -6,7 +6,7 @@ DATA = lo_drop.sql lo_test.sql
 DOCS = README.lo
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/lo
diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile
index bc64e009b65cf03cf27c02b2c56283d6e1c93e52..982c55d7a2530115aec5d613335f0bdb163e19d4 100644
--- a/contrib/ltree/Makefile
+++ b/contrib/ltree/Makefile
@@ -7,7 +7,7 @@ DOCS = README.ltree
 REGRESS = ltree
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/ltree
diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index 2c26156ec6c8c7617b1b4175ecb6720eed50fb21..82103c807f8a09fe170d06451fa6f82e66f463ee 100644
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
@@ -1,5 +1,5 @@
 #
-# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.9 2004/08/20 20:13:05 momjian Exp $
+# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.10 2005/09/27 17:13:05 tgl Exp $
 #
 
 NAME	= mpgsql
@@ -10,7 +10,7 @@ OBJS	= mpgsql.o
 PG_CPPFLAGS = -I$(libpq_srcdir)
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/mSQL-interface
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index 56ca83c026e8b3499354d28586d47c6bfea5d70d..3511c656af67e941f080c5eb4e04a851a8a801e7 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.7 2005/03/25 18:17:11 momjian Exp $
+# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.8 2005/09/27 17:13:06 tgl Exp $
 
 PROGRAM = oid2name
 OBJS	= oid2name.o
@@ -9,7 +9,7 @@ PG_LIBS = $(libpq_pgport)
 DOCS = README.oid2name
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/oid2name
diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile
index ff748b8eac4439c6fc351b459475f79bd02bbca9..5bec1a20b66cb354e78ec08cd827efa9b3a671e5 100644
--- a/contrib/pg_buffercache/Makefile
+++ b/contrib/pg_buffercache/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/pg_buffercache/Makefile,v 1.1 2005/03/12 15:36:24 neilc Exp $
+# $PostgreSQL: pgsql/contrib/pg_buffercache/Makefile,v 1.2 2005/09/27 17:13:07 tgl Exp $
 
 MODULE_big = pg_buffercache
 OBJS	= pg_buffercache_pages.o
@@ -7,7 +7,7 @@ DATA_built = pg_buffercache.sql
 DOCS = README.pg_buffercache
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pg_buffercache
diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile
index 0ef3c3ed174dc7e64ea601d1d45a17302575c5d4..993089151a47a527e13bc54d244e914dd60b0aae 100644
--- a/contrib/pg_trgm/Makefile
+++ b/contrib/pg_trgm/Makefile
@@ -10,7 +10,7 @@ REGRESS = pg_trgm
 
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pg_trgm
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index 55e1c68114bdddd5284c08c3a417876ea9ee021c..1529986c3d5fbd368cbf97c66f19d66e716dd581 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.13 2005/03/25 18:17:11 momjian Exp $
+# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.14 2005/09/27 17:13:08 tgl Exp $
 
 PROGRAM = pgbench
 OBJS	= pgbench.o
@@ -9,7 +9,7 @@ PG_LIBS = $(libpq_pgport)
 DOCS = README.pgbench README.pgbench_jis
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pgbench
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
index 657e6d236fac9925b6796ea5fb5da2829d13fd57..a8f17adf5e04e7cddfe6a50dd2c2eabc1d6f6c4e 100644
--- a/contrib/pgcrypto/Makefile
+++ b/contrib/pgcrypto/Makefile
@@ -1,5 +1,5 @@
 #
-# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.22 2005/08/13 02:06:20 momjian Exp $
+# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.23 2005/09/27 17:13:08 tgl Exp $
 #
 
 INT_SRCS = md5.c sha1.c sha2.c internal.c blf.c rijndael.c \
@@ -44,7 +44,7 @@ REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
 
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pgcrypto
diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile
index 4f9b3403933c886c140a7b7c2dcadaafe981ac25..3a3a02f522f14eeb06d5ee80b34853eeeff7a928 100644
--- a/contrib/pgstattuple/Makefile
+++ b/contrib/pgstattuple/Makefile
@@ -2,7 +2,7 @@
 #
 # pgstattuple Makefile
 #
-# $PostgreSQL: pgsql/contrib/pgstattuple/Makefile,v 1.3 2004/08/20 20:13:07 momjian Exp $
+# $PostgreSQL: pgsql/contrib/pgstattuple/Makefile,v 1.4 2005/09/27 17:13:09 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ DOCS		= README.pgstattuple README.pgstattuple.euc_jp
 DATA_built	= pgstattuple.sql
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pgstattuple
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index e48583d792d746bb05b723cb2d9bcf1180452882..564ffe63c842acb4fa29e7c101a20841396e5177 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.12 2004/08/20 20:13:07 momjian Exp $
+# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.13 2005/09/27 17:13:09 tgl Exp $
 
 MODULE_big = seg
 OBJS = seg.o segparse.o
@@ -9,7 +9,7 @@ REGRESS = seg
 EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/seg
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index e8c146eae9b06caf24118ec0413da861709baebd..bc3b1fd99ff321fd97bc274dcbd2ccc29428aa24 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.25 2004/11/17 17:45:59 tgl Exp $
+# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.26 2005/09/27 17:13:10 tgl Exp $
 
 MODULES = autoinc insert_username moddatetime refint timetravel
 DATA_built = $(addsuffix .sql, $(MODULES))
@@ -9,7 +9,7 @@ DOCS	= README.spi $(addsuffix .example, $(MODULES))
 PG_CPPFLAGS = -DREFINT_VERBOSE
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/spi
diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile
index b2b8cb2e003434b2b91bcdcbf163a339471a2018..be18f9163e3c31a11952be8bdc694d9336ad3a4c 100644
--- a/contrib/tablefunc/Makefile
+++ b/contrib/tablefunc/Makefile
@@ -6,7 +6,7 @@ REGRESS = tablefunc
 SHLIB_LINK += $(filter -lm, $(LIBS))
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/tablefunc
diff --git a/contrib/tips/Makefile b/contrib/tips/Makefile
index 2b925176e9e969dbc11b768ad7a1d6de90186b9e..2aca82af299eafa81b3d1f4e05cfdac95e2494a1 100644
--- a/contrib/tips/Makefile
+++ b/contrib/tips/Makefile
@@ -1,9 +1,9 @@
-# $PostgreSQL: pgsql/contrib/tips/Makefile,v 1.7 2004/08/20 20:13:08 momjian Exp $
+# $PostgreSQL: pgsql/contrib/tips/Makefile,v 1.8 2005/09/27 17:13:10 tgl Exp $
 
 DOCS = README.apachelog
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/tips
diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index 1691dd578d262dab08094ed69bf97988f7608b8c..8203b6669cbc5448986e3213a66496969f88ae23 100644
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.9 2005/07/24 23:30:10 tgl Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.10 2005/09/27 17:13:11 tgl Exp $
 
 MODULE_big = tsearch2
 OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
@@ -23,7 +23,7 @@ SHLIB_LINK += $(filter -lm, $(LIBS))
 
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/tsearch2
diff --git a/contrib/tsearch2/ispell/Makefile b/contrib/tsearch2/ispell/Makefile
index afaf4772ddcbe4d9b337c36530579f49cb60835d..562a2b3d6536624742ddffa9999f98eb59f668d9 100644
--- a/contrib/tsearch2/ispell/Makefile
+++ b/contrib/tsearch2/ispell/Makefile
@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.7 2005/09/15 11:14:18 teodor Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.8 2005/09/27 17:13:11 tgl Exp $
 
 PG_CPPFLAGS = -I$(srcdir)/.. 
 SUBOBJS = spell.o regis.o 
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/tsearch2
diff --git a/contrib/tsearch2/snowball/Makefile b/contrib/tsearch2/snowball/Makefile
index 095a6d6138278c9693c293bd8e505f14bdc28307..b5496632045dd0907eb9c187fcf069fd21d46c61 100644
--- a/contrib/tsearch2/snowball/Makefile
+++ b/contrib/tsearch2/snowball/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.6 2005/09/15 11:14:18 teodor Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $
 
 
 PG_CPPFLAGS = -I$(srcdir)/..
@@ -6,7 +6,7 @@ SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/tsearch2
diff --git a/contrib/tsearch2/wordparser/Makefile b/contrib/tsearch2/wordparser/Makefile
index 6a20e2e7d219a79a6b9c156f1ef126abb6110c4c..141e662f19bb08c628be7a4f6ffa0baff35855f0 100644
--- a/contrib/tsearch2/wordparser/Makefile
+++ b/contrib/tsearch2/wordparser/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.6 2005/09/15 11:14:18 teodor Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $
 
 
 PG_CPPFLAGS = -I$(srcdir)/..
@@ -6,7 +6,7 @@ SUBOBJS =  parser.o deflex.o
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/tsearch2
diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile
index bf033968d73397e9d18d8e3d28dbf97a5b8c9e07..f2eef6604fcd30241d09f81b846bdd844a82417c 100644
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/userlock/Makefile,v 1.18 2004/08/20 20:13:09 momjian Exp $
+# $PostgreSQL: pgsql/contrib/userlock/Makefile,v 1.19 2005/09/27 17:13:13 tgl Exp $
 
 MODULES = user_locks
 DATA_built = user_locks.sql
 DOCS = README.user_locks
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/userlock
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index b75296ef682575ccf5b00b0411d0cabe6c1508e0..349ae8bd0332a7b63b9544123f590728d54d07ca 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.14 2005/03/25 18:17:12 momjian Exp $
+# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.15 2005/09/27 17:13:13 tgl Exp $
 
 PROGRAM = vacuumlo
 OBJS	= vacuumlo.o
@@ -9,7 +9,7 @@ PG_LIBS = $(libpq_pgport)
 DOCS = README.vacuumlo
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/vacuumlo
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index 7d4779f25cba12b080ae28874067232f33049aa7..b30da283640528385516068499bbb4abffe927f0 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -14,7 +14,7 @@ DOCS = README.xml2
 override CFLAGS += $(shell xml2-config --cflags)
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/xml2
diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile
index 50c3a7404aed84c49f16a077612b3874d03ebe28..5ddb0ae78c60cdf2cbb8a3636ab9b935f7d4cc32 100644
--- a/src/tutorial/Makefile
+++ b/src/tutorial/Makefile
@@ -9,7 +9,7 @@
 # to build using the surrounding source tree.
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/tutorial/Makefile,v 1.18 2005/01/13 18:23:22 tgl Exp $
+#    $PostgreSQL: pgsql/src/tutorial/Makefile,v 1.19 2005/09/27 17:13:14 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/src/makefiles/pgxs.mk
 else
-PGXS = $(shell pg_config --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 endif