[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - firebird/ExternalProject_firebird.mk

[Andrzej J.R. Hunt]

 firebird/ExternalProject_firebird.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ef45930e5c2bb0129c4af63e2c912db676f18384
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Wed Jul 10 12:30:45 2013 +0100

    Modify DYLD_LIBRARY_PATH for firebrid to build on Mac OS.
    
    Change-Id: Iae45d39a9a1ce76b0af74c317c5990b3674a7ca6
    Reviewed-on: https://gerrit.libreoffice.org/4806
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk
index 8853eca..aa4c597 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -43,7 +43,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 				-L$(OUTDIR)/lib \
 				-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
 		&& export LD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
-		&& export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)" \
+		&& export DYLD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
+		$(if $(filter WNT,$(OS)),&& export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)") \
 		&& ./configure \
 			--without-editline \
 			--disable-superserver \