mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Upgrade to Autoconf 2.61:
- Change configure.in to use Autoconf 2.61 and update generated files. - Update build system and documentation to support now directory variables offered by Autoconf 2.61. - Replace usages of PGAC_CHECK_ALIGNOF by AC_CHECK_ALIGNOF, now available in Autoconf 2.61. - Drop our patched version of AC_C_INLINE, as Autoconf now has the change.
This commit is contained in:
Peter Eisentraut
10
doc/Makefile
10
doc/Makefile
@ -4,7 +4,7 @@
|
||||
#
|
||||
# Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $PostgreSQL: pgsql/doc/Makefile,v 1.29 2007/02/09 15:55:57 petere Exp $
|
||||
# $PostgreSQL: pgsql/doc/Makefile,v 1.30 2008/02/17 16:36:42 petere Exp $
|
||||
#
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -26,10 +26,8 @@ include $(top_builddir)/src/Makefile.global
|
||||
.NOTPARALLEL:
|
||||
|
||||
ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
|
||||
ifneq (,$(docdir))
|
||||
found_html = yes
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(wildcard $(srcdir)/man.tar.gz),)
|
||||
# SCO OpenServer's man system is sufficiently different to not bother.
|
||||
@ -72,7 +70,7 @@ endif # found_man
|
||||
|
||||
install: all installdirs
|
||||
ifdef found_html
|
||||
gzip -d -c $(srcdir)/postgres.tar.gz | ( cd $(DESTDIR)$(docdir)/html && $(TAR) xf - )
|
||||
gzip -d -c $(srcdir)/postgres.tar.gz | ( cd $(DESTDIR)$(htmldir)/html && $(TAR) xf - )
|
||||
endif
|
||||
ifdef found_man
|
||||
for file in man1/*.1 man$(sqlmansectnum)/*.$(sqlmansect) ; do \
|
||||
@ -83,7 +81,7 @@ endif
|
||||
|
||||
installdirs:
|
||||
ifdef found_html
|
||||
$(mkinstalldirs) '$(DESTDIR)$(docdir)'/html
|
||||
$(mkinstalldirs) '$(DESTDIR)$(htmldir)'/html
|
||||
endif
|
||||
ifdef found_man
|
||||
$(mkinstalldirs) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 $(sqlmansectnum))
|
||||
@ -92,7 +90,7 @@ endif
|
||||
|
||||
uninstall:
|
||||
ifdef found_html
|
||||
-rm -f $(addprefix $(DESTDIR)$(docdir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -))
|
||||
-rm -f $(addprefix $(DESTDIR)$(htmldir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -))
|
||||
endif
|
||||
ifdef found_man
|
||||
-rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf - | sed -e 's,man$(sqlmansect_dummy)/,man$(sqlmansectnum)/,' -e 's/.$(sqlmansect_dummy)$$/.$(sqlmansect)/'))
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.301 2008/02/16 21:51:04 tgl Exp $ -->
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.302 2008/02/17 16:36:43 petere Exp $ -->
|
||||
|
||||
<chapter id="installation">
|
||||
<title><![%standalone-include[<productname>PostgreSQL</>]]>
|
||||
@ -589,23 +589,11 @@ su - postgres
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--datadir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Sets the directory for read-only data files used by the
|
||||
installed programs. The default is
|
||||
<filename><replaceable>PREFIX</>/share</>. Note that this has
|
||||
nothing to do with where your database files will be placed.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--sysconfdir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
The directory for various configuration files,
|
||||
Sets the directory for various configuration files,
|
||||
<filename><replaceable>PREFIX</>/etc</> by default.
|
||||
</para>
|
||||
</listitem>
|
||||
@ -615,7 +603,7 @@ su - postgres
|
||||
<term><option>--libdir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
The location to install libraries and dynamically loadable
|
||||
Sets the location to install libraries and dynamically loadable
|
||||
modules. The default is
|
||||
<filename><replaceable>EXEC-PREFIX</>/lib</>.
|
||||
</para>
|
||||
@ -626,12 +614,47 @@ su - postgres
|
||||
<term><option>--includedir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
The directory for installing C and C++ header files. The
|
||||
Sets the directory for installing C and C++ header files. The
|
||||
default is <filename><replaceable>PREFIX</>/include</>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--datarootdir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Sets the root directory for various types of read-only data
|
||||
files. This only sets the default for some of the following
|
||||
options. The default is
|
||||
<filename><replaceable>PREFIX</>/share</>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--datadir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Sets the directory for read-only data files used by the
|
||||
installed programs. The default is
|
||||
<filename><replaceable>DATAROOTDIR</></>. Note that this has
|
||||
nothing to do with where your database files will be placed.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--localedir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Sets the directory for installing locale data, in particular
|
||||
message translation catalog files. The default is
|
||||
<filename><replaceable>DATAROOTDIR</>/locale</>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--mandir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
@ -639,23 +662,31 @@ su - postgres
|
||||
The man pages that come with <productname>PostgreSQL</> will be installed under
|
||||
this directory, in their respective
|
||||
<filename>man<replaceable>x</></> subdirectories.
|
||||
The default is <filename><replaceable>PREFIX</>/man</>.
|
||||
The default is <filename><replaceable>DATAROOTDIR</>/man</>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--with-docdir=<replaceable>DIRECTORY</></option></term>
|
||||
<term><option>--without-docdir</option></term>
|
||||
<term><option>--docdir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Documentation files, except <quote>man</> pages, will be
|
||||
installed into this directory. The default is
|
||||
<filename><replaceable>PREFIX</>/doc</>. If the option
|
||||
<option>--without-docdir</option> is specified, the
|
||||
documentation will not be installed by <command>make
|
||||
install</command>. This is intended for packaging scripts
|
||||
that have special methods for installing documentation.
|
||||
Sets the root directory for installing documentation files,
|
||||
except <quote>man</> pages. This only sets the default for
|
||||
the following options. The default value for this option is
|
||||
<filename><replaceable>DATAROOTDIR</>/doc/postgresql</>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>--htmldir=<replaceable>DIRECTORY</></option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
The HTML-formatted documentation for
|
||||
<productname>PostgreSQL</productname> will be installed under
|
||||
this directory. The default is
|
||||
<filename><replaceable>DATAROOTDIR</></>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
Reference in New Issue
Block a user