From e55cec4a40f407555ac74585c82c7739bd464cdb Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 2 Nov 2018 09:10:58 +0100
Subject: =?UTF-8?q?Revert=20"Don't=20use=20expand,=20just=20add=20the=20ne?=
 =?UTF-8?q?w=20variables=20to=20the=20paths,=20in=20some=20wa=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/openssl.mpb | 13 +++++++++++--
 config/xerces.mpb  | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/openssl.mpb b/config/openssl.mpb
index c9d6f873..8af0fef4 100644
--- a/config/openssl.mpb
+++ b/config/openssl.mpb
@@ -4,8 +4,17 @@
 // default. If we ever add a new ssl library, then you
 // would likely enable only one ssl library feature.
 feature(openssl) {
-  includes += $(SSL_INCDIR) $(SSL_ROOT)/include
-  libpaths += $(SSL_LIBDIR) $(SSL_ROOT)/lib
+  expand(SSL_INCDIR) {
+    $SSL_INCDIR
+    $(SSL_ROOT)/include
+  }
+  expand(SSL_LIBDIR) {
+    $SSL_LIBDIR
+    $(SSL_ROOT)/lib
+  }
+
+  includes += $(SSL_INCDIR)
+  libpaths += $(SSL_LIBDIR)
 
   specific(prop:windows) {
     lit_libs += libeay32 ssleay32
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 84e1c82b..85f7e8aa 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -29,8 +29,17 @@ feature(xerces2) {
   lit_libs += $(XERCESLIB)
 }
 feature(xerces3) {
-  includes += $(XERCESC_INCDIR) $(XERCESCROOT)/include
-  libpaths += $(XERCESC_LIBDIR) $(XERCESCROOT)/lib
+  expand(XERCESC_INCDIR) {
+    $XERCESC_INCDIR
+    $(XERCESCROOT)/include
+  }
+  expand(XERCESC_LIBDIR) {
+    $XERCESC_LIBDIR
+    $(XERCESCROOT)/lib
+  }
+
+  includes += $(XERCESC_INCDIR)
+  libpaths += $(XERCESC_LIBDIR)
 
   specific(prop:microsoft) {
     xerceslib = xerces-c_3
-- 
cgit v1.2.1