Fix translation of strings in psql \d output (translation in headers worked,

[pg-rex/syncrep.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 16f9057..ec26142 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.45 2006/08/18 19:58:05 adunstan Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.57 2010/01/29 01:06:18 adunstan Exp $
 #
 
 subdir =
@@ -14,13 +14,30 @@ all:
        $(MAKE) -C config all
        @echo "All of PostgreSQL successfully made. Ready to install."
 
+world:
+       $(MAKE) -C doc html
+       $(MAKE) -C src all
+       $(MAKE) -C config all
+       $(MAKE) -C contrib all
+       @echo "PostgreSQL, contrib and HTML documentation successfully made. Ready to install."
+
+html man:
+       $(MAKE) -C doc $@
+
 install:
        $(MAKE) -C doc $@
        $(MAKE) -C src $@
        $(MAKE) -C config $@
        @echo "PostgreSQL installation complete."
 
-installdirs uninstall:
+install-world:
+       $(MAKE) -C doc install
+       $(MAKE) -C src install
+       $(MAKE) -C config install
+       $(MAKE) -C contrib install
+       @echo "PostgreSQL and contrib installation complete."
+
+installdirs uninstall coverage:
        $(MAKE) -C doc $@
        $(MAKE) -C src $@
        $(MAKE) -C config $@
@@ -44,11 +61,11 @@ clean:
 # Important: distclean `src' last, otherwise Makefile.global
 # will be gone too soon.
 distclean maintainer-clean:
-       -$(MAKE) -C doc $@
-       -$(MAKE) -C contrib $@
-       -$(MAKE) -C config $@
-       -$(MAKE) -C src $@
-       -rm -f config.cache config.log config.status GNUmakefile
+       $(MAKE) -C doc $@
+       $(MAKE) -C contrib $@
+       $(MAKE) -C config $@
+       $(MAKE) -C src $@
+       rm -f config.cache config.log config.status GNUmakefile
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
@@ -57,48 +74,36 @@ check: all
 check installcheck installcheck-parallel:
        $(MAKE) -C src/test $@
 
+installcheck-world:
+       $(MAKE) -C src/test installcheck
+       $(MAKE) -C src/pl installcheck
+       $(MAKE) -C src/interfaces/ecpg installcheck
+       $(MAKE) -C contrib installcheck
+
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
        ./config.status $@
 
 
 ##########################################################################
 
-distdir        := postgresql-$(VERSION)
-dummy  := =install=
-garbage := =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
+distdir        = postgresql-$(VERSION)
+dummy  = =install=
+garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-dist: $(distdir).tar.gz 
-ifeq ($(split-dist), yes)
-dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz 
-endif
-dist:
-       -rm -rf $(distdir)
+dist: $(distdir).tar.gz $(distdir).tar.bz2
+       rm -rf $(distdir)
 
 $(distdir).tar: distdir
        $(TAR) chf $@ $(distdir)
 
-opt_files := \
-       src/tools src/tutorial \
-       $(addprefix src/pl/, plperl plpython tcl)
-
-docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail
-
-postgresql-base-$(VERSION).tar: distdir
-       $(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \
-         -f $@ $(distdir)
-
-postgresql-docs-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(addprefix $(distdir)/, $(docs_files))
-
-postgresql-opt-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(addprefix $(distdir)/, $(opt_files))
+.INTERMEDIATE: $(distdir).tar
 
-postgresql-test-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(distdir)/src/test
+distdir-location:
+       @echo $(distdir)
 
 distdir:
-       -rm -rf $(distdir)* $(dummy)
-       for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+       rm -rf $(distdir)* $(dummy)
+       for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
          file=`expr X$$x : 'X\./\(.*\)'`; \
          if test -d "$(top_srcdir)/$$file" ; then \
            mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
@@ -115,10 +120,10 @@ distdir:
        $(MAKE) -C $(distdir) distclean
        rm -f $(distdir)/README.CVS
 
-distcheck: $(distdir).tar.gz
-       -rm -rf $(dummy)
+distcheck: dist
+       rm -rf $(dummy)
        mkdir $(dummy)
-       $(GZIP) -d -c $< | $(TAR) xf -
+       $(GZIP) -d -c $(distdir).tar.gz | $(TAR) xf -
        install_prefix=`cd $(dummy) && pwd`; \
        cd $(distdir) \
        && ./configure --prefix="$$install_prefix"
@@ -131,7 +136,7 @@ distcheck: $(distdir).tar.gz
        $(MAKE) -C $(distdir) dist
 # Room for improvement: Check here whether this distribution tarball
 # is sufficiently similar to the original one.
-       -rm -rf $(distdir) $(dummy)
+       rm -rf $(distdir) $(dummy)
        @echo "Distribution integrity checks out."
 
 .PHONY: dist distdir distcheck