Rationalize error messages within jsonfuncs.c.

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8ccbdcc49fb802acc8cbec6194b397ba38fbafac..69e08249c1daede9254c4c74a07fb4414fc653a4 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,6 +20,9 @@ $(call recurse,world,doc src config contrib,all)
 world:
        +@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
 
+# build src/ before contrib/
+world-contrib-recurse: world-src-recurse
+
 html man:
        $(MAKE) -C doc $@
 
@@ -33,7 +36,10 @@ $(call recurse,install-world,doc src config contrib,install)
 install-world:
        +@echo "PostgreSQL, contrib, and documentation installation complete."
 
-$(call recurse,installdirs uninstall coverage,doc src config)
+# 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,distprep,doc src config contrib)
 
@@ -55,12 +61,14 @@ distclean maintainer-clean:
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
-check: all
+check check-tests: all
+
+check check-tests installcheck installcheck-parallel installcheck-tests:
+       $(MAKE) -C src/test/regress $@
 
-check installcheck installcheck-parallel:
-       $(MAKE) -C src/test $@
+$(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 $@
@@ -95,10 +103,8 @@ distdir:
          fi || exit; \
        done
        $(MAKE) -C $(distdir) distprep
-       $(MAKE) -C $(distdir)/doc/src/sgml/ HISTORY INSTALL regress_README
-       cp $(distdir)/doc/src/sgml/HISTORY $(distdir)/
+       $(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
        cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
-       cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README
        $(MAKE) -C $(distdir) distclean
        rm -f $(distdir)/README.git
 
@@ -121,4 +127,4 @@ distcheck: dist
        rm -rf $(distdir) $(dummy)
        @echo "Distribution integrity checks out."
 
-.PHONY: dist distdir distcheck docs install-docs world install-world installcheck-world
+.PHONY: dist distdir distcheck docs install-docs world check-world install-world installcheck-world