From ddfb3b30e516af10e51a6372912c08561a19f62c Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Wed, 8 Mar 2006 13:13:53 +0000
Subject: INTEGRATION: CWS pj50 (1.30.4); FILE MERGED 2006/02/26 13:39:01
 pjanik 1.30.4.1: #i62419#: export LDFLAGS only when set to prevent conflicts
 with user  environment (patch by Mox).

---
 berkeleydb/makefile.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'berkeleydb')

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 9434eda91e91..35171c85ff7f 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.30 $
+#   $Revision: 1.31 $
 #
-#   last change: $Author: rt $ $Date: 2006-01-13 16:23:55 $
+#   last change: $Author: rt $ $Date: 2006-03-08 14:13:53 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -68,6 +68,7 @@ PATCH_FILE_NAME=db-4.2.52.patch
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)$(COM)"=="LINUXGCC"
 LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.EXPORT: LDFLAGS
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 .IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
@@ -75,8 +76,8 @@ CC:=$(COMPATH)$/bin$/cc
 CXX:=$(COMPATH)$/bin$/CC
 .ENDIF          # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
 LDFLAGS:=-R\''$$$$ORIGIN'\'
-.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
 .EXPORT: LDFLAGS
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION= \
-- 
cgit