Version 4.3.0.0.beta1, tag libreoffice-4.3.0.0.beta1
[LibreOffice.git] / external / firebird / firebird-icu.patch.1
blob6045ee19f0b0d1a2c4a73843465feeba697b435e
1 diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples
2 --- firebird.org/builds/posix/Makefile.in.examples      2013-06-21 20:47:17.047657633 +0100
3 +++ firebird/builds/posix/Makefile.in.examples  2013-06-21 21:01:45.297638456 +0100
4 @@ -53,10 +53,10 @@
5  export PATH
6  
7  ifeq ($(PLATFORM),DARWIN)
8 -DYLD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
9 +DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
10  export DYLD_LIBRARY_PATH
11  else
12 -LD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
13 +LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
14  export LD_LIBRARY_PATH
15  endif
16  GPRE_FLAGS=    -r -m -z -n
17 diff -ur firebird.org/builds/posix/Makefile.in.firebird firebird/builds/posix/Makefile.in.firebird
18 --- firebird.org/builds/posix/Makefile.in.firebird      2013-06-21 20:47:17.060657632 +0100
19 +++ firebird/builds/posix/Makefile.in.firebird  2013-06-21 21:12:00.559624868 +0100
20 @@ -44,7 +44,7 @@
21  TEST_PATH = @FIREBIRD_BUILD_DIR@
22  # Firebird libs path set at link time (-R) so do not override local requirements - nmcc 28/12/2002
23  #LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
24 -LD_LIBRARY_PATH=$(LIB)
25 +LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(LIB)
27  #export ISC_USER
28  #export ISC_PASSWORD