summaryrefslogtreecommitdiff
path: root/dh_shlibdeps
diff options
context:
space:
mode:
authorjoey <joey>2004-11-30 18:21:56 +0000
committerjoey <joey>2004-11-30 18:21:56 +0000
commit257593ffa0765054c936527a0a4e36c7c3097f7b (patch)
tree3283036f7c51fcba85ed5781041a194f54d18ad5 /dh_shlibdeps
parent312037f7fd70f4f1527b01ff48e4178ad854a167 (diff)
r1726: releasing version 4.2.25
Diffstat (limited to 'dh_shlibdeps')
-rwxr-xr-xdh_shlibdeps14
1 files changed, 11 insertions, 3 deletions
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;
+ }
}
}