#
# 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 =
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 $@
rm -rf $(distdir) $(dummy)
@echo "Distribution integrity checks out."
-.PHONY: dist distdir distcheck
-unexport split-dist
+.PHONY: dist distdir distcheck docs install-docs
#
# PostgreSQL documentation makefile
#
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.138 2010/02/05 19:31:18 momjian Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.139 2010/03/30 00:10:46 petere Exp $
#
#----------------------------------------------------------------------------
include $(top_builddir)/src/Makefile.global
-distprep: html man
+all: html man
+
+distprep: html distprep-man
ifndef COLLATEINDEX
## Man pages
##
-man: man-stamp
+man distprep-man: man-stamp
man-stamp: stylesheet-man.xsl postgres.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
## Install
##
-vpathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,. $(VPATH)))))
+vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done`
-found_html = $(wildcard html-stamp $(srcdir)/html-stamp)
+install: install-html
-ifneq ($(wildcard man-stamp $(srcdir)/man-stamp),)
-# SCO OpenServer's man system is sufficiently different to not bother.
ifneq ($(PORTNAME), sco)
-found_man = yes
-endif
+install: install-man
endif
-install: $(if $(found_html),install-html) $(if $(found_man),install-man)
-
installdirs:
$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
fixed_manpage_files = $(fixed_nonsql_manpage_files) $(fixed_sql_manpage_files)
-all: all-man
-all-man: $(fixed_manpage_files)
+man: $(fixed_manpage_files)
$(fixed_nonsql_manpage_files): fixedman/%: %
@$(MKDIR_P) $(dir $@)
@$(MKDIR_P) $(dir $@)
$(fix_sqlmansectnum) $< >$@
-install-man: all-man
+install-man: man
cp -R $(sort $(dir $(fixed_manpage_files))) '$(DESTDIR)$(mandir)'
clean: clean-man
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.343 2010/03/17 17:12:31 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.344 2010/03/30 00:10:46 petere Exp $ -->
<chapter id="installation">
<title><![%standalone-include[<productname>PostgreSQL</>]]>
</para>
<para>
- If you want to build everything that can be built, including the HTML
- documentation and the Additional Modules, type instead:
+ If you want to build everything that can be built, including the
+ documentation (HTML and man pages), and the additional modules
+ (<filename>contrib</filename>), type instead:
<screen>
<userinput>gmake world</userinput>
</screen>
</para>
<para>
+ To install the documentation (HTML and man pages), enter:
+<screen>
+<userinput>gmake install-docs</userinput>
+</screen>
+ </para>
+
+ <para>
If you built the world above, type instead:
<screen>
<userinput>gmake install-world</userinput>
</screen>
+ This also installs the documentation.
</para>
<para>