From f7d54f00980bc40fc9c445ba601f804fd54a30c7 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 19 Feb 2009 11:42:47 +0000
Subject: CWS-TOOLING: integrate CWS sb104 2009-01-27 13:09:06 +0100 sb 
 r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in
 with moved tags/DEV300_m40/set_soenv.in 2009-01-27 10:56:40 +0100 sb  r266966
 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
 2009-01-20 14:37:00 +0100 sb  r266581 : #i97992# missing treatment of
 Solaris-only adjustvisibility as build-internal tool 2009-01-20 09:32:38
 +0100 sb  r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone:
 DEV300:m39) 2009-01-14 13:40:45 +0100 sb  r266296 : #i97992# do not pass
 comment lines to shell 2009-01-14 12:50:34 +0100 sb  r266290 : #i97992# avoid
 problems with checkdll not finding AWTLIB and its dependents 2009-01-14
 12:49:20 +0100 sb  r266289 : #i97992# on Linux and Solaris, regxpcom
 apparently needs to be called with the libxpcom.so directory on the
 LD_LIBRARY_PATH 2009-01-13 09:41:37 +0100 sb  r266196 : #i97992# fixed
 AUGMENT_LIBRARY_PATH definitions 2009-01-12 18:02:03 +0100 sb  r266177 :
 #i97992# get rid of LD_LIBRARY_PATH in build environment

---
 soltools/adjustvisibility/makefile.mk | 1 +
 soltools/mkdepend/makefile.mk         | 2 +-
 soltools/util/makefile.pmk            | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'soltools')

diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index d2529c8ddf14..a4963b2eb071 100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -51,6 +51,7 @@ APP1TARGET	= 	adjustvisibility
 APP1OBJS	=	$(OBJ)$/adjustvisibility.obj
 DEPOBJFILES	=	$(APP1OBJ)
 APP1STDLIBS =   -lelf
+APP1RPATH   =   NONE
 
 .ENDIF "$(OS)"=="SOLARIS"
 
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index a7a85ee3c788..ca6f57ef1c7b 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -63,7 +63,7 @@ OBJFILES=  \
 
 APP1TARGET=makedepend
 APP1OBJS=$(OBJFILES)
-
+APP1RPATH=NONE
 
 .INCLUDE : target.mk
 
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index 43d44f08648b..b0a67f85e06a 100644
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 # find 'makedepend' in own output tree
-MAKEDEPEND=$(WRAPCMD) $(BIN)$/makedepend
+MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/makedepend
 
 # find 'adjustvisibility' in own output tree
-ADJUSTVISIBILITY=$(WRAPCMD) $(BIN)$/adjustvisibility
+ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/adjustvisibility
-- 
cgit