From a6aea22ab88fe6695b63aa8c946f41f98ffa59ab Mon Sep 17 00:00:00 2001
From: Guenter Obiltschnig <guenter.obiltschnig@appinf.com>
Date: Sun, 6 Mar 2016 20:30:39 +0100
Subject: [PATCH] fix SET_LD_LIBRARY_PATH to include POCO_BASE/LIBDIR if
 different from LIBPATH

---
 build/rules/global | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/rules/global b/build/rules/global
index 1e51d3d77..4cd27ef3b 100644
--- a/build/rules/global
+++ b/build/rules/global
@@ -238,10 +238,15 @@ ifndef LIBPREFIX
 LIBPREFIX = lib
 endif
 
-ifeq ($(POCO_HOST_OSNAME),Darwin)
-SET_LD_LIBRARY_PATH = DYLD_LIBRARY_PATH=$(LIBPATH)
+ifeq ($(LIBPATH),$(POCO_BASE)/$(LIBDIR))
+LD_LIBRARY_PATH = $(LIBPATH)
 else
-SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH=$(LIBPATH)
+LD_LIBRARY_PATH = $(LIBPATH):$(POCO_BASE)/$(LIBDIR)
+endif
+ifeq ($(POCO_HOST_OSNAME),Darwin)
+SET_LD_LIBRARY_PATH = DYLD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
+else
+SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
 endif
 
 #