1fdb6185a1
Change-Id: I2cb4f4b63ab526c3d034adf8c006103cde7e7304 Reviewed-on: https://gerrit.libreoffice.org/6302 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
28 lines
1.2 KiB
Groff
28 lines
1.2 KiB
Groff
diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples
|
|
--- firebird.org/builds/posix/Makefile.in.examples 2013-06-21 20:47:17.047657633 +0100
|
|
+++ firebird/builds/posix/Makefile.in.examples 2013-06-21 21:01:45.297638456 +0100
|
|
@@ -53,10 +53,10 @@
|
|
export PATH
|
|
|
|
ifeq ($(PLATFORM),DARWIN)
|
|
-DYLD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
|
|
+DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
|
|
export DYLD_LIBRARY_PATH
|
|
else
|
|
-LD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
|
|
+LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
|
|
export LD_LIBRARY_PATH
|
|
endif
|
|
GPRE_FLAGS= -r -m -z -n
|
|
diff -ur firebird.org/builds/posix/Makefile.in.firebird firebird/builds/posix/Makefile.in.firebird
|
|
--- firebird.org/builds/posix/Makefile.in.firebird 2013-06-21 20:47:17.060657632 +0100
|
|
+++ firebird/builds/posix/Makefile.in.firebird 2013-06-21 21:12:00.559624868 +0100
|
|
@@ -44,7 +44,7 @@
|
|
TEST_PATH = @FIREBIRD_BUILD_DIR@
|
|
# Firebird libs path set at link time (-R) so do not override local requirements - nmcc 28/12/2002
|
|
#LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
|
|
-LD_LIBRARY_PATH=$(LIB)
|
|
+LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(LIB)
|
|
|
|
#export ISC_USER
|
|
#export ISC_PASSWORD
|