Author: darcy
Date: Sat Jan 2 11:02:40 2016
New Revision: 687
Log:
The docs Makefile now requires gmake. On Linux make is gmake but on BSD
systems we need to run gmake. While not perfect, this change will check
for a separate gmake executible and use it if it exists. Also, added a
comment in Makefile to help users figure out why the error is happening.
Modified:
branches/4.x/docs/Makefile
branches/4.x/mkdocs
Modified: branches/4.x/docs/Makefile
==============================================================================
--- branches/4.x/docs/Makefile Sat Jan 2 10:57:27 2016 (r686)
+++ branches/4.x/docs/Makefile Sat Jan 2 11:02:40 2016 (r687)
@@ -1,5 +1,5 @@
# Makefile for Sphinx documentation
-#
+# -*- Note: requires GNU Make -*-
# You can set these variables from the command line.
SPHINXOPTS =
Modified: branches/4.x/mkdocs
==============================================================================
--- branches/4.x/mkdocs Sat Jan 2 10:57:27 2016 (r686)
+++ branches/4.x/mkdocs Sat Jan 2 11:02:40 2016 (r687)
@@ -1,5 +1,8 @@
#! /bin/sh
+MAKE=make
+which gmake && MAKE=gmake
+
# small safety test
if [ ! -f module/pgmodule.c ]
then
@@ -10,4 +13,4 @@
echo "Making Sphinx docs..."
cd docs
-make html
+${MAKE} html
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
