summaryrefslogtreecommitdiff
path: root/GNUmakefile.in
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2010-03-30 00:10:46 +0000
committerPeter Eisentraut <peter_e@gmx.net>2010-03-30 00:10:46 +0000
commit29ccc32c3024586a0b171cac4224277ddacecad8 (patch)
tree1a6fb752801a025d213ad2df78568a69b14f9406 /GNUmakefile.in
parent3f76f9613d98890306086a3b18198c43d34a6d85 (diff)
downloadpostgresql-29ccc32c3024586a0b171cac4224277ddacecad8.tar.gz
Separate targets "make docs" and "make install-docs" for the documentation
It is no longer installed by default, but included in "make world"/"make install-world". Documentation updated accordingly. Also, fix vpathsearch function to work when calling make install-docs without previous make docs.
Diffstat (limited to 'GNUmakefile.in')
-rw-r--r--GNUmakefile.in19
1 files changed, 11 insertions, 8 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in
index ec26142269..86623a3854 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
#
# PostgreSQL top level makefile
#
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.57 2010/01/29 01:06:18 adunstan Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.58 2010/03/30 00:10:46 petere Exp $
#
subdir =
@@ -9,33 +9,37 @@ top_builddir = .
include $(top_builddir)/src/Makefile.global
all:
- $(MAKE) -C doc all
$(MAKE) -C src all
$(MAKE) -C config all
@echo "All of PostgreSQL successfully made. Ready to install."
+docs:
+ $(MAKE) -C doc all
+
world:
- $(MAKE) -C doc html
+ $(MAKE) -C doc all
$(MAKE) -C src all
$(MAKE) -C config all
$(MAKE) -C contrib all
- @echo "PostgreSQL, contrib and HTML documentation successfully made. Ready to install."
+ @echo "PostgreSQL, contrib, and 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."
+install-docs:
+ $(MAKE) -C doc install
+
install-world:
$(MAKE) -C doc install
$(MAKE) -C src install
$(MAKE) -C config install
$(MAKE) -C contrib install
- @echo "PostgreSQL and contrib installation complete."
+ @echo "PostgreSQL, contrib, and documentation installation complete."
installdirs uninstall coverage:
$(MAKE) -C doc $@
@@ -139,5 +143,4 @@ distcheck: dist
rm -rf $(distdir) $(dummy)
@echo "Distribution integrity checks out."
-.PHONY: dist distdir distcheck
-unexport split-dist
+.PHONY: dist distdir distcheck docs install-docs