Commit 44eaafe3 authored by Peter Eisentraut's avatar Peter Eisentraut

End users shouldn't have to invoke a separate command to install the

documentation. Therefore it's now installed by default. If there is no
documentation to be found (i.e., you are not using the distribution)
then this step is skipped.

Add --docdir option to configure to control installation directory.
parent 5da7e533
No related merge requests found
# #
# PostgreSQL top level makefile # PostgreSQL top level makefile
# #
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.7 2000/07/16 14:50:28 petere Exp $ # $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.8 2000/07/17 22:31:56 petere Exp $
# #
subdir = subdir =
...@@ -9,20 +9,23 @@ top_builddir = . ...@@ -9,20 +9,23 @@ top_builddir = .
include src/Makefile.global include src/Makefile.global
all: all:
$(MAKE) -C doc all
$(MAKE) -C src all $(MAKE) -C src all
@echo "All of PostgreSQL successfully made. Ready to install." @echo "All of PostgreSQL successfully made. Ready to install."
install: install:
$(MAKE) -C doc install
$(MAKE) -C src install $(MAKE) -C src install
@cat $(srcdir)/register.txt @cat $(srcdir)/register.txt
installdirs uninstall: installdirs uninstall clean:
$(MAKE) -C doc $@
$(MAKE) -C src $@ $(MAKE) -C src $@
clean: # Important: distclean `doc' before `src', otherwise Makefile.global
$(MAKE) -C src clean # will be gone too soon.
distclean maintainer-clean: distclean maintainer-clean:
-$(MAKE) -C doc $@
-$(MAKE) -C src $@ -$(MAKE) -C src $@
-rm -f config.cache config.log config.status GNUmakefile -rm -f config.cache config.log config.status GNUmakefile
......
...@@ -14,7 +14,14 @@ dnl 8. System services ...@@ -14,7 +14,14 @@ dnl 8. System services
dnl dnl
dnl Read the Autoconf manual for details. dnl Read the Autoconf manual for details.
dnl The GNU folks apparently haven't heard that some people don't use
dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
define([info], [doc])
define([infodir], [docdir])
AC_INIT(src/backend/access/common/heaptuple.c) AC_INIT(src/backend/access/common/heaptuple.c)
undefine([infodir])
undefine([info])
AC_PREFIX_DEFAULT(/usr/local/pgsql) AC_PREFIX_DEFAULT(/usr/local/pgsql)
AC_CONFIG_HEADER(src/include/config.h) AC_CONFIG_HEADER(src/include/config.h)
...@@ -78,7 +85,7 @@ esac ...@@ -78,7 +85,7 @@ esac
AC_MSG_ERROR([ AC_MSG_ERROR([
******************************************************************* *******************************************************************
PostgreSQL has apparently not been ported to your platform yet. PostgreSQL has apparently not been ported to your platform yet.
To try a manual configuration, look info the src/template directory To try a manual configuration, look into the src/template directory
for a similar platform and use the \`--with-template=' option. for a similar platform and use the \`--with-template=' option.
Please also contact <pgsql-ports@postgresql.org> to see about Please also contact <pgsql-ports@postgresql.org> to see about
......
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# #
# Makefile # PostgreSQL documentation installation makefile
# Postgres documentation installation makefile
# Thomas Lockhart
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# # $Header: /cvsroot/pgsql/doc/Makefile,v 1.18 2000/07/17 22:31:57 petere Exp $
# IDENTIFICATION
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.17 2000/07/16 14:50:32 petere Exp $
# #
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
PGDOCS= $(POSTGRESDIR)/doc # This directory doesn't build anything, it is only responsible for
SRCDIR= ../src # installing the documenation. It is invoked automatically by the
# top-level makefile. The files to be installed are prepared specially
TAR= tar # and are placed in this directory during distribution bundling. In
# CVS-based trees these files don't exist, so we skip the installation
# in that case.
#
# To actually build the documenation, look into the src/ and src/sgml
# subdirectories.
# Pick up Makefile.global from the source area subdir = doc
# This is the only resource from the code source area and is optional. top_builddir = ..
# Actually, we want this to get Makefile.custom - thomas 1998-03-01 include $(top_builddir)/src/Makefile.global
ifneq ($(wildcard $(SRCDIR)/Makefile.global), )
include $(SRCDIR)/Makefile.global
endif
# Hmm, made this optional but jade _really_ doesn't like them missing
# - thomas 1998-03-01
ifneq ($(HDSL), )
HTMLOPTS= -d $(HDSL)
endif
ifneq ($(PDSL), )
PRINTOPTS= -d $(PDSL)
endif
MODULES= admin postgres programmer tutorial user MODULES := admin postgres programmer tutorial user
TARGETS= $(MODULES:%=%.html)
.PRECIOUS: postgres.tex postgres.dvi found_MODULES := $(foreach module, $(MODULES), $(shell test -f $(srcdir)/$(module).tar.gz && echo $(module)))
.PHONY: beforeinstall install all clean distclean
beforeinstall: ifneq ($(wildcard $(srcdir)/man.tar.gz),)
-@if [ ! -d $(PGDOCS) ]; then mkdir $(PGDOCS); fi found_man := yes
endif
install:
$(MAKE) all
$(MAKE) man
all: beforeinstall $(MODULES) all:
clean:
rm -rf $(MODULES)
distclean: install: all installdirs
$(MAKE) clean ifneq ($(strip $(found_MODULES)),)
for module in $(found_MODULES); do \
gunzip -c $${module}.tar.gz | ( cd $(docdir)/$$module && $(TAR) xf - ) || \
exit; \
done
endif
ifdef found_man
gunzip -c man.tar.gz | ( cd $(mandir) && $(TAR) xf - )
endif
man:
-@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
gunzip -c man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
# installdirs:
# Generic production rules $(mkinstalldirs) $(mandir) $(addprefix $(docdir)/, . $(found_MODULES))
#
# Unpack tar file
# Put into area pointed to by $(PGDOCS).
## Make a local file to keep track of dependencies,
## if $(PGDOCS) points somewhere else.
## Disable this for now - thomas 1998-03-01
# Remove the contents of the target directory
# to replace symlinks - thomas 1998-03-01
%: %.tar.gz uninstall:
rm -rf ./$@ $(PGDOCS)/$* -rm -rf $(addprefix $(docdir)/, $(MODULES))
if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi ifdef found_man
gunzip -c $< | (cd $(PGDOCS)/$* ; $(TAR) xf - ) -rm -f $(addprefix $(mandir)/, $(shell gunzip -c man.tar.gz | tar tf -))
# touch ./$* endif
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.87 2000/07/16 14:50:41 petere Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.88 2000/07/17 22:31:59 petere Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
...@@ -95,8 +95,8 @@ localstatedir = @localstatedir@ ...@@ -95,8 +95,8 @@ localstatedir = @localstatedir@
libdir = @libdir@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
mandir = @mandir@ mandir = @mandir@
docdir = @docdir@
docdir = ${prefix}/doc
odbcinst_ini_dir = @odbcinst_ini_dir@ odbcinst_ini_dir = @odbcinst_ini_dir@
# old variable names for installation directories # old variable names for installation directories
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment