From c29f733925c8afa043cd5a5aee64f54787f61a53 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Fri, 11 Aug 2017 00:09:47 +0100
Subject: [PATCH] makeCGAL: Updated to handle older operating systems

which name the 64bit library directory lib rather than lib64

Resolves bug report https://bugs.openfoam.org/view.php?id=2657
---
 Allwmake | 4 ++--
 makeCGAL | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Allwmake b/Allwmake
index baa97916..1fd86cfc 100755
--- a/Allwmake
+++ b/Allwmake
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -355,7 +355,7 @@ then
     if [ -r $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libCGAL.so ]
     then
         echo "    CGAL headers in $CGAL_ARCH_PATH/include"
-        echo "    CGAL libs    in $CGAL_ARCH_PATH/lib"
+        echo "    CGAL libs    in $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
     else
         ./makeCGAL
     fi
diff --git a/makeCGAL b/makeCGAL
index 8b7fbe64..3af742f0 100755
--- a/makeCGAL
+++ b/makeCGAL
@@ -274,6 +274,7 @@ CMAKE_OPTIONS
         -DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
         -DCMAKE_BUILD_TYPE=Release \
         -DWITH_CGAL_Qt5=OFF \
+        -DCGAL_INSTALL_LIB_DIR=lib$WM_COMPILER_LIB_ARCH \
         $configBoost $configGmpMpfr \
         $CGAL_SOURCE_DIR \
     && make -j $WM_NCOMPPROCS \