12 files changed, 19 insertions, 19 deletions
diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c
index cff74aa72f0..62599193c33 100644
--- a/src/backend/port/ipc_test.c
+++ b/src/backend/port/ipc_test.c
@@ -10,7 +10,7 @@
  *	   USE_xxx_SEMAPHORES and USE_xxx_SHARED_MEMORY settings you want.
  *	   Also, adjust the pg_sema.c and pg_shmem.c symlinks in
  *	   src/backend/port/ if needed.
- *	2. In src/backend/port/, do "gmake ipc_test".
+ *	2. In src/backend/port/, do "make ipc_test".
  *	3. Run ipc_test and see if it works.
  *	4. If it seems to work, try building the whole system and running
  *	   the parallel regression tests for a more complete test.
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index e397210a711..b80de4e2475 100644
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 SUBDIRS = include pgtypeslib ecpglib compatlib preproc
 
-# Suppress parallel build of subdirectories to avoid a bug in gmake 3.82, cf
+# Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf
 # http://savannah.gnu.org/bugs/?30653
 # https://bugzilla.redhat.com/show_bug.cgi?id=835424
 # (There are some other parallelism bugs in the subdirectory makefiles
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index b19e074bb26..eae8695ace7 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -30,7 +30,7 @@ OBJS=	preproc.o type.o ecpg.o output.o parser.o \
 	keywords.o c_keywords.o ecpg_keywords.o kwlookup.o ../ecpglib/typename.o descriptor.o variable.o \
 	$(WIN32RES)
 
-# Suppress parallel build to avoid a bug in gmake 3.82
+# Suppress parallel build to avoid a bug in GNU make 3.82
 # (see comments in ../Makefile)
 ifeq ($(MAKE_VERSION),3.82)
 .NOTPARALLEL:
diff --git a/src/pl/plperl/README b/src/pl/plperl/README
index 3ed8653fdea..e61dd57f53a 100644
--- a/src/pl/plperl/README
+++ b/src/pl/plperl/README
@@ -2,7 +2,7 @@ src/pl/plperl/README
 
 PL/Perl allows you to write PostgreSQL functions and procedures in
 Perl.  To include PL/Perl in the build use './configure --with-perl'.
-To build from this directory use 'gmake all; gmake install'.  libperl
+To build from this directory use 'make all; make install'.  libperl
 must have been built as a shared library, which is usually not the
 case in standard installations.
 
diff --git a/src/test/isolation/README b/src/test/isolation/README
index 69095778c6c..490be8e615d 100644
--- a/src/test/isolation/README
+++ b/src/test/isolation/README
@@ -14,7 +14,7 @@ behaviors have been added as well.
 To run the tests, you need to have a server running at the default port
 expected by libpq.  (You can set PGPORT and so forth in your environment
 to control this.)  Then run
-    gmake installcheck
+    make installcheck
 To run just specific test(s), you can do something like
     ./pg_isolation_regress fk-contention fk-deadlock
 (look into the specs/ subdirectory to see the available tests).
@@ -22,7 +22,7 @@ To run just specific test(s), you can do something like
 The prepared-transactions test requires the server's
 max_prepared_transactions parameter to be set to at least 3; therefore it
 is not run by default.  To include it in the test run, use
-    gmake installcheck-prepared-txns
+    make installcheck-prepared-txns
 
 To define tests with overlapping transactions, we use test specification
 files with a custom syntax, which is described in the next section.  To add
diff --git a/src/test/locale/README b/src/test/locale/README
index 980df8005b9..e290e31480e 100644
--- a/src/test/locale/README
+++ b/src/test/locale/README
@@ -9,9 +9,9 @@ locale data.  Then there are test-sort.pl and test-sort.py that test
 collating.
 
 To run a test for some locale run
-    gmake check-$locale
+    make check-$locale
 for example
-    gmake check-koi8-r
+    make check-koi8-r
 
 Currently, there are only tests for a few locales available.  The script
 'runall' calls test-ctype to test libc and locale data, test-sort.pl
diff --git a/src/test/regress/regressplans.sh b/src/test/regress/regressplans.sh
index 67b54b697d6..678ab0a3f22 100755
--- a/src/test/regress/regressplans.sh
+++ b/src/test/regress/regressplans.sh
@@ -26,8 +26,8 @@
 # efficient available query plans!  Have patience.
 
 
-# Select make to use --- default gmake, can be overridden by env var
-MAKE="${MAKE:-gmake}"
+# Select make to use --- default 'make', can be overridden by env var
+MAKE="${MAKE:-make}"
 
 # If PGOPTIONS is already defined, we'll add the -f switches to it.
 PGOPTIONS="${PGOPTIONS:-}"
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index 6cfe95019b8..1e962a3e984 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -40,8 +40,8 @@ endif
 
 # We could do this test in the action section:
 #	$(if $(ZIC),$(ZIC),./zic)
-# but gmake versions <= 3.78.1 or perhaps later have a bug
-# that causes a segfault;  gmake 3.81 or later fixes this.
+# but GNU make versions <= 3.78.1 or perhaps later have a bug
+# that causes a segfault;  GNU make 3.81 or later fixes this.
 ifeq (,$(ZIC))
 ZIC= ./zic
 endif
diff --git a/src/timezone/README b/src/timezone/README
index d09b8854a09..98d98f235f3 100644
--- a/src/timezone/README
+++ b/src/timezone/README
@@ -27,7 +27,7 @@ effort is needed to update the time zone abbreviation lists under tznames/.
 These need to be changed whenever new abbreviations are invented or the
 UTC offset associated with an existing abbreviation changes.  To detect
 if this has happened, after installing new files under data/ do
-	gmake abbrevs.txt
+	make abbrevs.txt
 which will produce a file showing all abbreviations that are in current
 use according to the data/ files.  Compare this to known_abbrevs.txt,
 which is the list that existed last time the tznames/ files were updated.
diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index 16ee06119b0..ecc5eb1f8ad 100644
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -12,7 +12,7 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and
 
 4) Remove all derived files (pgindent has trouble with one of the flex macros):
 
-	gmake maintainer-clean
+	make maintainer-clean
 
    Or:
 
@@ -47,10 +47,10 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and
 	# stop is only necessary if it's going to install in a location with an
 	# already running server
 	pg_ctl stop
-	gmake -C src install
-	gmake -C contrib install
+	make -C src install
+	make -C contrib install
 	pg_ctl start
-	gmake installcheck-world
+	make installcheck-world
 
 10) Remove Perl backup files after testing
 
diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile
index b180da51036..16dc390f718 100644
--- a/src/tutorial/Makefile
+++ b/src/tutorial/Makefile
@@ -5,7 +5,7 @@
 #
 # By default, this builds against an existing PostgreSQL installation
 # (the one identified by whichever pg_config is first in your path).
-# Within a configured source tree, you can say "gmake NO_PGXS=1 all"
+# Within a configured source tree, you can say "make NO_PGXS=1 all"
 # to build using the surrounding source tree.
 #
 # IDENTIFICATION
diff --git a/src/tutorial/README b/src/tutorial/README
index ce9d733c703..b137cdfad34 100644
--- a/src/tutorial/README
+++ b/src/tutorial/README
@@ -7,7 +7,7 @@ This directory contains SQL tutorial scripts.  To look at them, first do a
 	% make
 to compile all the scripts and C files for the user-defined functions
 and types.  (make needs to be GNU make --- it may be named something
-different on your system, often gmake)
+different on your system, often 'gmake')
 
 Then, run psql with the -s (single-step) flag:
 	% psql -s