r1816: releasing version 5.0.4

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index c92d1bf100b9208a3cb93791c911d01c705db5f0..b5b0ff5c7f01f135b4e86719719b9ac92365f433 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_shlibdeps - calculate shared library dependancies
+dh_shlibdeps - calculate shared library dependencies
 
 =cut
 
@@ -17,7 +17,7 @@ B<dh_shlibdeps> [S<I<debhelper options>>] [B<-L>I<package>] [B<-l>I<directory>]
 =head1 DESCRIPTION
 
 dh_shlibdeps is a debhelper program that is responsible for calculating
-shared library dependancies for packages.
+shared library dependencies for packages.
 
 This program is merely a wrapper around L<dpkg-shlibdeps(1)> that calls it
 once for each package listed in the control file, passing it
@@ -36,7 +36,7 @@ Pass "params" to L<dpkg-shlibdeps(1)>.
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude files that contain "item" anywhere in their filename from being
-passed to dpkg-shlibdeps. This will make their dependancies be ignored.
+passed to dpkg-shlibdeps. This will make their dependencies be ignored.
 This may be useful in some situations, but use it with caution. This option
 may be used more than once to exclude more than one thing.
 
@@ -80,7 +80,6 @@ information.
 
 init();
 
-# Add directory to library search path.
 if ($dh{L_PARAMS}) {
        my @paths=();
        # Add to existing paths, if set.
@@ -96,13 +95,9 @@ if ($dh{L_PARAMS}) {
                }
        }
        $dh{L_PARAMS}=join(':', @paths);
-       $ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS};
-       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}");
 }
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-       next if is_udeb($package);
-       
        my $tmp=tmpdir($package);
        my $ext=pkgext($package);
 
@@ -129,14 +124,30 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) {
                        @opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs"));
                }
+               
+               my $ld_library_path_orig=$ENV{LD_LIBRARY_PATH};
+               if ($dh{L_PARAMS}) {
+                       $ENV{LD_LIBRARY_PATH}=$dh{L_PARAMS};
+                       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}");
+               }
+               
                doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",
                        @opts,@{$dh{U_PARAMS}},@filelist);
+
+               if ($dh{L_PARAMS}) {
+                       if (defined $ld_library_path_orig) {
+                               $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+                       }
+                       else {
+                               delete $ENV{LD_LIBRARY_PATH};
+                       }
+               }
        }
 }
 
 =head1 SEE ALSO
 
-L<debhelper(7)>
+L<debhelper(7)>, L<dpkg-shlibdeps(1)>
 
 This program is a part of debhelper.