summaryrefslogtreecommitdiff
path: root/dh_shlibdeps
diff options
context:
space:
mode:
authorjoey <joey>2001-04-20 05:25:31 +0000
committerjoey <joey>2001-04-20 05:25:31 +0000
commite62627c0fac365bc7e35c51bb86480de6402c6e9 (patch)
tree476b0094e05a54fb8c5d3911e20d5515b1aedaef /dh_shlibdeps
parentefb26174273abbd866fa5f6ed5a6fd17d749cb53 (diff)
downloaddebhelper-e62627c0fac365bc7e35c51bb86480de6402c6e9.tar.gz
r462: * dh_shlibdeps: document that -l accepts multiple dirs, and
make multiple dirs absolute properly, not just the first.
Diffstat (limited to 'dh_shlibdeps')
-rwxr-xr-xdh_shlibdeps26
1 files changed, 17 insertions, 9 deletions
diff --git a/dh_shlibdeps b/dh_shlibdeps
index 33fd9411..552687e4 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -40,13 +40,14 @@ passed to dpkg-shlibdeps. This will make their dependancies 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.
-=item B<-l>I<directory>
+=item B<-l>I<directory>[:directory:directory:..]
-Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will be set to the specified
-directory. This is useful for multi-binary packages where a library
-is built in one package and another package contains binaries linked
-against said library. Relative paths will be made absolute for the
-benefit of dpkg-shlibdeps.
+Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will be set to 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
+library. Relative paths will be made absolute for the benefit of
+dpkg-shlibdeps.
=back
@@ -77,10 +78,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (@filelist) {
if ($dh{L_PARAMS}) {
- # Force the path absolute.
- unless ($dh{L_PARAMS}=~m:^/:) {
- $dh{L_PARAMS}=getcwd()."/$dh{L_PARAMS}";
+ my @paths=();
+ foreach (split(/:/, $dh{L_PARAMS})) {
+ # Force the path absolute.
+ if (m:^/:) {
+ push @paths, $_;
+ }
+ else {
+ push @paths, getcwd()."/$_";
+ }
}
+ $dh{L_PARAMS}=join(':', @paths);
$ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS};
verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS} \\");
}