From abb4a093bd111a1f01d73eb2e84c015830d04f1f Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 15 May 2001 02:35:09 +0000
Subject: r468:    * dh_shlibdeps: the -l switch now just adds to
 LD_LIBRARY_PATH, if it is      already set. Newer fakeroots set it, and
 clobbering their settings      breaks things since they LD_PRELOAD a library
 that is specified in the      LD_LIBRARY_PATH. (blah) Closes: #97494

---
 dh_shlibdeps | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'dh_shlibdeps')

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 552687e4..ebba4746 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -42,7 +42,7 @@ may be used more than once to exclude more than one thing.
 
 =item B<-l>I<directory>[:directory:directory:..]
 
-Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will be set to the 
+Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will have added to it the 
 specified directory (or directories -- separate with colons). This is
 useful for multi-binary packages where a library is built in one
 package and another package contains binaries linked against said
@@ -79,6 +79,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (@filelist) {
 		if ($dh{L_PARAMS}) {
 			my @paths=();
+			# Add to existing paths, if set.
+			push @paths, $ENV{'LD_LIBRARY_PATH'}
+				if exists $ENV{'LD_LIBRARY_PATH'}
 			foreach (split(/:/, $dh{L_PARAMS})) {
 				# Force the path absolute.
 				if (m:^/:) {
-- 
cgit v1.2.3