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.

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index fb7d1424874e199194d3bde5f0df084917e4d1ee..28c26787fce93fd1eeb75dbeba51ccd766830ae8 100644 (file)
--- 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 37ee6b0288aafcba1fc835bb7db32ffe0d0c1fbc..c6322ec26d4b6fa10074b31e7be1fab09ab5b9fa 100644 (file)
--- 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 579dce62b750769a605efadaddd16cd816baeb24..a65c4ed0c8fff888a2c2e4832ec9f1bc02b564e3 100644 (file)
--- 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 5abe76cc0d9f88e4b9bf7d13d20f2f340a519e82..ba4f73e76b28597a6b9764c44e875f018de3a433 100644 (file)
--- 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 a9a0366ef50215ea6410cc72340a350d3ab2c8c3..68d92d31cff9988db923f7c136a65ec26fee00dd 100644 (file)
--- 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 de0e11f7142e12d034e50dc4176c5285a1ed6d51..eeb2539d372349f20e28a1477600707768425b40 100644 (file)
--- 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)