Re: [HACKERS] [patch] to build docs on Mac OS X El Capitan with MacPorts

2015-11-03 Thread Neil Tiffin 
I should add that this was required for a postgres git build using MacPorts to 
supply dependencies and not a build of postgres using MacPorts.

Neil

> On Nov 3, 2015, at 8:11 AM, Robert Haas  wrote:
> 
> On Sun, Nov 1, 2015 at 8:41 AM, Neil Tiffin  wrote:
>> The attached patch was required to get the docs to build on Mac OS X 10.11.1 
>> (15B42) with MacPorts 2.3.4.  After changing docbook.m4 ‘autoreconf’ has to 
>> be run.  This patch does not include the new version of ‘configure'
> 
> Can anyone else verify this?



-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Re: [HACKERS] [patch] to build docs on Mac OS X El Capitan with MacPorts

2015-11-03 Thread Robert Haas 
On Sun, Nov 1, 2015 at 8:41 AM, Neil Tiffin  wrote:
> The attached patch was required to get the docs to build on Mac OS X 10.11.1 
> (15B42) with MacPorts 2.3.4.  After changing docbook.m4 ‘autoreconf’ has to 
> be run.  This patch does not include the new version of ‘configure'

Can anyone else verify this?

-- 
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

[HACKERS] [patch] to build docs on Mac OS X El Capitan with MacPorts

2015-11-01 Thread Neil Tiffin 
The attached patch was required to get the docs to build on Mac OS X 10.11.1 
(15B42) with MacPorts 2.3.4.  After changing docbook.m4 ‘autoreconf’ has to be 
run.  This patch does not include the new version of ‘configure'

As explained in the devel documentation (J.2.6) the docs could be made to build 
by adding ‘export DOCBOOKSTYLE=/opt/local/share/dsssl/docbook-dsssl'

However, in J.2.4 it implies that just using MacPorts will work without 
additional setup.  This patch makes that happen.

diff --git a/config/docbook.m4 b/config/docbook.m4
index 4304fa7..f9d 100644
--- a/config/docbook.m4
+++ b/config/docbook.m4
@@ -55,7 +55,7 @@ AC_CACHE_VAL([pgac_cv_path_stylesheets],
 [if test -n "$DOCBOOKSTYLE"; then
   pgac_cv_path_stylesheets=$DOCBOOKSTYLE
 else
-  for pgac_prefix in /usr /usr/local /opt /sw; do
+  for pgac_prefix in /usr /usr/local /opt /opt/local /sw; do
 for pgac_infix in share lib; do
   for pgac_postfix in \
 sgml/stylesheets/nwalsh-modular \
@@ -65,7 +65,8 @@ else
 sgml/docbook/dsssl/modular \
 sgml/docbook/stylesheet/dsssl/modular \
 sgml/docbook/dsssl-stylesheets \
-sgml/dsssl/docbook-dsssl-nwalsh
+sgml/dsssl/docbook-dsssl-nwalsh \
+dsssl/docbook-dsssl
   do
 pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
 if test -r "$pgac_candidate/html/docbook.dsl" \





-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers