X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_shlibdeps;h=77d8d6a93991edadcce6878dfa90da0e16375d8a;hb=257593ffa0765054c936527a0a4e36c7c3097f7b;hp=54c42ce1b8945d463d497afbdd0b21a15c3be3a5;hpb=312037f7fd70f4f1527b01ff48e4178ad854a167;p=debhelper.git

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 54c42ce..77d8d6a 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -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,8 +95,6 @@ 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}}) {
@@ -127,8 +124,19 @@ 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}) {
+			$ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+		}
 	}
 }