summaryrefslogtreecommitdiff
path: root/dh_shlibdeps
diff options
context:
space:
mode:
authorjoey <joey>2001-05-15 02:35:09 +0000
committerjoey <joey>2001-05-15 02:35:09 +0000
commitabb4a093bd111a1f01d73eb2e84c015830d04f1f (patch)
tree9a1aed229c971000497f58e78af3856ad380e844 /dh_shlibdeps
parentd7b306162c16a3d261fe6c7420ac484ac3d9f3ea (diff)
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
Diffstat (limited to 'dh_shlibdeps')
-rwxr-xr-xdh_shlibdeps5
1 files changed, 4 insertions, 1 deletions
diff --git a/dh_shlibdeps b/dh_shlibdeps
index 552687e..ebba474 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:^/:) {