Fix ssl tests for when tls-server-end-point is not supported

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a573880d793023da80adcb4fc7758e68536786af..dc76a5d11dd88e4c921964c840517a6d93dde3b9 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -39,14 +39,15 @@ install-world:
 # build src/ before contrib/
 install-world-contrib-recurse: install-world-src-recurse
 
-$(call recurse,installdirs uninstall coverage init-po update-po,doc src config)
+$(call recurse,installdirs uninstall init-po update-po,doc src config)
 
-$(call recurse,distprep,doc src config contrib)
+$(call recurse,distprep coverage,doc src config contrib)
 
 # clean, distclean, etc should apply to contrib too, even though
 # it's not built by default
 $(call recurse,clean,doc contrib src config)
 clean:
+       rm -rf tmp_install/
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
@@ -57,18 +58,17 @@ distclean maintainer-clean:
        $(MAKE) -C contrib $@
        $(MAKE) -C config $@
        $(MAKE) -C src $@
-       rm -f config.cache config.log config.status GNUmakefile
+       rm -rf tmp_install/
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
-
-check check-tests: all
+       rm -f config.cache config.log config.status GNUmakefile
 
 check check-tests installcheck installcheck-parallel installcheck-tests:
        $(MAKE) -C src/test/regress $@
 
-$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
+$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)
 
-$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
+$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib src/bin,installcheck)
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
        ./config.status $@