From ce3f41d42c1a5ec681011d9559d25aa175190818 Mon Sep 17 00:00:00 2001
From: Jürgen Knödlseder <jurgen.knodlseder@irap.omp.eu>
Date: Mon, 26 Mar 2018 12:08:40 +0200
Subject: [PATCH] Fix MANPATH for Mac OS X systems (#2420)

---
 ChangeLog                                  |  3 ++-
 doc/source/admin/release_history/1.5.1.rst |  2 ++
 src/ctools-setup.in                        | 16 ++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 042c74d..5ec9aeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
-2018-02-16
+2018-03-26
 
         * Bug fix version 1.5.1 released
         ================================
 
+        Fix MANPATH for Mac OS X systems (#2420)
         Take energy dispersion in csresspec modelling into account (#2341)
         Enable using csphagen for HESS, VERITAS and MAGIC observations (#2307)
 
diff --git a/doc/source/admin/release_history/1.5.1.rst b/doc/source/admin/release_history/1.5.1.rst
index da8dcaf..1424099 100644
--- a/doc/source/admin/release_history/1.5.1.rst
+++ b/doc/source/admin/release_history/1.5.1.rst
@@ -10,6 +10,8 @@ ctools 1.5.1 is a bug fix release for ctools release 1.5.
 
 The following bugs were fixed:
 
+* [`2420 <https://cta-redmine.irap.omp.eu/issues/2420>`_] -
+  Fix ``MANPATH`` for Mac OS X systems
 * [`2341 <https://cta-redmine.irap.omp.eu/issues/2341>`_] -
   Take energy dispersion in :ref:`csresspec` modelling into account
 
diff --git a/src/ctools-setup.in b/src/ctools-setup.in
index f4359fb..0a4c654 100644
--- a/src/ctools-setup.in
+++ b/src/ctools-setup.in
@@ -172,13 +172,17 @@ fi
 #
 # Set MANPATH
 # ==============
-if [ "x$MANPATH" = x ]; then
-  manpath=${manpath:-}
-  MANPATH="$man_dir:${manpath}"
+if [ -z "${MANPATH}" ]; then
+  if `which manpath > /dev/null 2>&1` ; then
+    default_manpath=`manpath`
+  else
+    default_manpath=`man -w 2> /dev/null`
+  fi
+fi
+if [ -z "${MANPATH}" ]; then
+  MANPATH=$man_dir:${default_manpath}; export MANPATH
 else
-  MANPATH=`echo ":$MANPATH:" | \
-    sed "s%:$man_dir:%:%g" | sed "s%::*$%%"`
-  MANPATH="$man_dir$MANPATH"
+  MANPATH=$man_dir:$MANPATH; export MANPATH
 fi
 
 #
--
libgit2 0.21.4