fix SET_LD_LIBRARY_PATH to include POCO_BASE/LIBDIR if different from LIBPATH

This commit is contained in:
Guenter Obiltschnig 2016-03-06 20:30:11 +01:00
parent 9327564309
commit f28591baeb

View File

@ -235,10 +235,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
#