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:39 +01:00
parent 00f1979f4f
commit a6aea22ab8

View File

@ -238,10 +238,15 @@ ifndef LIBPREFIX
LIBPREFIX = lib LIBPREFIX = lib
endif endif
ifeq ($(POCO_HOST_OSNAME),Darwin) ifeq ($(LIBPATH),$(POCO_BASE)/$(LIBDIR))
SET_LD_LIBRARY_PATH = DYLD_LIBRARY_PATH=$(LIBPATH) LD_LIBRARY_PATH = $(LIBPATH)
else 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 endif
# #