From 49137ec9d469f744289d0dfa2487a7fc1ef217cb Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 25 Apr 2014 15:40:35 -0400
Subject: [PATCH] Clean up temp installations after client program tests.

Commit 7d0f493f19607774fdccb1a1ea06fdd96a3d9698 added infrastructure
to perform tests in assorted src/bin/ subdirectories, but forgot to
teach "make clean" to clean up the detritus the tests leave behind.
---
 src/bin/initdb/Makefile         | 3 +--
 src/bin/pg_basebackup/Makefile  | 1 +
 src/bin/pg_config/Makefile      | 1 +
 src/bin/pg_controldata/Makefile | 1 +
 src/bin/pg_ctl/Makefile         | 1 +
 src/bin/scripts/Makefile        | 3 +--
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index fb7d142487..28c26787fc 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -53,12 +53,11 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f initdb$(X) $(OBJS) encnames.c localtime.c
-
+	rm -rf tmp_check
 
 # ensure that changes in datadir propagate into object file
 initdb.o: initdb.c $(top_builddir)/src/Makefile.global
 
-
 check: all
 	$(prove_check)
 
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
index 37ee6b0288..c6322ec26d 100644
--- a/src/bin/pg_basebackup/Makefile
+++ b/src/bin/pg_basebackup/Makefile
@@ -48,6 +48,7 @@ clean distclean maintainer-clean:
 	rm -f pg_basebackup$(X) pg_receivexlog$(X) pg_recvlogical$(X) \
 		pg_basebackup.o pg_receivexlog.o pg_recvlogical.o \
 		$(OBJS)
+	rm -rf tmp_check
 
 check: all
 	$(prove_check)
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index 579dce62b7..a65c4ed0c8 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -47,6 +47,7 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f pg_config$(X) $(OBJS)
+	rm -rf tmp_check
 
 check: all
 	$(prove_check)
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index 5abe76cc0d..ba4f73e76b 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -33,6 +33,7 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f pg_controldata$(X) $(OBJS)
+	rm -rf tmp_check
 
 check: all
 	$(prove_check)
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index a9a0366ef5..68d92d31cf 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -36,6 +36,7 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f pg_ctl$(X) $(OBJS)
+	rm -rf tmp_check
 
 check: all
 	$(prove_check)
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index de0e11f714..eeb2539d37 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -63,12 +63,11 @@ installdirs:
 uninstall:
 	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(addsuffix $(X), $(PROGRAMS)))
 
-
 clean distclean maintainer-clean:
 	rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS))
 	rm -f common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o $(WIN32RES)
 	rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c
-
+	rm -rf tmp_check
 
 check: all
 	$(prove_check)
-- 
2.40.0