@@ -19,20 +19,11 @@ https://github.com/michaelpq/pg_arman.
1919Installation
2020------------
2121
22- Compiling pg_arman requires a PostgreSQL installation and can be done in
23- two ways:
22+ Compiling pg_arman requires a PostgreSQL installation to be in place
23+ as well as a raw source tree. Pass the path to the PostgreSQL source tree
24+ to make, in the top_srcdir variable:
2425
25- 1. Put pg_arman project directory inside PostgreSQL source tree as
26- contrib/pg_arman, and use this command for compilation:
27-
28- $ cd $POSTGRES_SOURCE/contrib/pg_arman
29- $ make
30-
31- 2. Keep the project directory as-is and use the PGXS development
32- infrastructure provided by a PostgreSQL installation to perform the
33- compilation:
34-
35- $ make USE_PGXS=1
26+ make USE_PGXS=1 top_srcdir=<path to PostgreSQL source tree>
3627
3728In addition, you must have pg_config in $PATH.
3829
@@ -55,7 +46,8 @@ In order to generate the documentation, the variables XMLTO and ASCIIDOC
5546need to be set to proper values indicating where are located the binaries
5647of respectively xmlto and asciidoc. An example of build is as follows:
5748
58- $ make USE_PGXS=1 ASCIIDOC=asciidoc XMLTO=xmlto
49+ make top_srcdir=<path to PostgreSQL source tree> \
50+ ASCIIDOC=asciidoc XMLTO=xmlto
5951
6052They could as well be set as environment variables for development
6153purposes.
@@ -64,19 +56,15 @@ On OSX, it is necessary to set XML_CATALOG_FILES to point to the correct
6456xml catalogs. In the case of an environment with Homebrew after having
6557install xmlto and asciidoc:
6658
67- $ export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"
59+
6860
6961Regression tests
7062----------------
7163
7264The test suite of pg_arman is available in the code tree and can be
7365launched in a way similar to common PostgreSQL extensions and modules:
7466
75- 1) "make check" or "make installcheck" if the project directory is
76- located in PostgreSQL code tree.
77-
78- 2) "make installcheck" on an already installed server if project
79- directory is kept as-is.
67+ make installcheck
8068
8169License
8270-------
