Merge branch '2420-manpath' into integration

# Conflicts: # ChangeLog

Merge branch '2420-manpath' into integration
# Conflicts: # ChangeLog
Jürgen Knödlseder
2 parents 34aaf10c ce3f41d4
Showing 3 changed files with 14 additions and 7 deletions
ChangeLog
doc/source/admin/release_history/1.5.1.rst
src/ctools-setup.in
@@ -8,11 +8,12 @@
         Accelerate IRF and RING background methods in ctskymap (#2309)
  
  
-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)
  
@@ -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
  
@@ -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
  
 #