diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
index 5cfd1a2a63b3dfdad9e7d5e2df8d07519926a9da..345b438526e0b7b30c8539da1eefe439fcdc854a 100644
--- a/documentation/doxygen/Makefile
+++ b/documentation/doxygen/Makefile
@@ -1,7 +1,15 @@
 
 .PHONY: filter folders mathjax js images doxygen replaceCollaborationDiagrams
 
-NJOB ?= $(shell nproc)
+OS=$(shell uname)
+ifeq ($(UNAME), Darwin)
+   export DOXYGEN_LDD := otool -L
+   NJOB ?= $(shell sysctl -n hw.ncpu)
+else
+   export DOXYGEN_LDD := ldd
+   NJOB ?= $(shell nproc)
+endif
+
 PYTHON_EXECUTABLE ?= python3
 export PYTHON_EXECUTABLE
 export PYSPARK_PYTHON := $(PYTHON_EXECUTABLE)
diff --git a/documentation/doxygen/makeCollaborationDiagrams.sh b/documentation/doxygen/makeCollaborationDiagrams.sh
index 51654710beef05759a7ad1b43940a46d14aa577b..df8712181c6d3caed15dc921f5581c400bcb6814 100755
--- a/documentation/doxygen/makeCollaborationDiagrams.sh
+++ b/documentation/doxygen/makeCollaborationDiagrams.sh
@@ -4,7 +4,7 @@
 
 HTMLPATH=$DOXYGEN_OUTPUT_DIRECTORY/html
 DOXYGEN_LDD=${DOXYGEN_LDD:=ldd}
-dotFile=$(mktemp /tmp/libraries_XXXX.dot)
+dotFile=$(mktemp /tmp/libraries.dot.XXXX)
 
 test -d "$HTMLPATH" || { echo "HTMLPATH '$HTMLPATH' not found."; exit 1; }
 test -d "$ROOTSYS"  || { echo "ROOTSYS not set"; exit 1; }
diff --git a/documentation/doxygen/modifyClassWebpages.sh b/documentation/doxygen/modifyClassWebpages.sh
index cc15fefa43189719a1a6d5960b0c04c524df9648..68523482b26b7e75bad395f51355bf51f78c715b 100755
--- a/documentation/doxygen/modifyClassWebpages.sh
+++ b/documentation/doxygen/modifyClassWebpages.sh
@@ -4,16 +4,7 @@
 
 # Finding the system we are running
 
-export DOXYGEN_LDD="ldd"
-listOfClasses=$(mktemp /tmp/listOfClasses_XXXXXX.txt)
-OS=`uname`
-
-case "$OS" in
-   "Linux") export DOXYGEN_LDD="ldd"
-   ;;
-   "Darwin")export DOXYGEN_LDD="otool -L"
-   ;;
-esac
+listOfClasses=$(mktemp /tmp/listOfClasses.XXXXXX)
 
 case "$1" in
    -j*)