From c3be031e07a7338ae80123eb4d1ac8c843f02beb Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 26 Jun 2015 17:40:25 +0200
Subject: [PATCH] lib/libpmodules.bash: - set PATH after sourcing lib.bash

---
 lib/libpmodules.bash | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/libpmodules.bash b/lib/libpmodules.bash
index 43c52c8..9440480 100644
--- a/lib/libpmodules.bash
+++ b/lib/libpmodules.bash
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin
-
 # disable auto-echo feature of 'cd'
 unset CDPATH
 
@@ -19,9 +17,15 @@ declare -rx BUILD_BASEDIR=$(abspath $SHLIBDIR/..)
 
 
 
-
+PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 declare -r OS=$(uname -s)
+if [[ "${OS}" == "Darwin" ]]; then
+	# :FIXME: why do we need this?
+	[[ -d "/opt/X11/bin" ]] && PATH+=':/opt/X11/bin'
+fi
+
+
 
 # number of parallel make jobs
 declare -i  JOBS=3