From b3e5620d2a8d81aa2fae8a620a21b338179e4f57 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 5 Jun 2020 12:30:57 +0200
Subject: [PATCH] COMP: typo in surfaceBooleanFeatures/PolyhedronReader
 Make/options

ENH: strip {GMP,MPRF}_ARCH_PATH in make rules
---
 .../surfaceBooleanFeatures/PolyhedronReader/Make/options      | 2 +-
 wmake/rules/General/cgal-header-only                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
index ed80ba4905..8321bcd046 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
@@ -17,6 +17,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
-    -L${CGAL_LIBS} \
+    ${CGAL_LIBS} \
     -lsurfMesh \
     -lmeshTools
diff --git a/wmake/rules/General/cgal-header-only b/wmake/rules/General/cgal-header-only
index a10ba81760..ff99b6ffe3 100644
--- a/wmake/rules/General/cgal-header-only
+++ b/wmake/rules/General/cgal-header-only
@@ -4,11 +4,11 @@
 CGAL_INC  = -DCGAL_HEADER_ONLY
 CGAL_LIBS =
 
-ifneq (,$(GMP_ARCH_PATH))
+ifneq (,$(strip $(GMP_ARCH_PATH)))
   CGAL_INC  += -I$(GMP_ARCH_PATH)/include
   CGAL_LIBS += -L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH)
 endif
-ifneq (,$(MPFR_ARCH_PATH))
+ifneq (,$(strip $(MPFR_ARCH_PATH)))
   CGAL_INC  += -I$(MPFR_ARCH_PATH)/include
   CGAL_LIBS += -L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH)
 endif