diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-07 08:06:48 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-07 08:06:48 +0000 |
| commit | 16a37b40e7c1bc762159949cc30444e76e900d85 (patch) | |
| tree | 199dd4d5ecad70a1a61c424a561e375e0cf15ae6 /usr.sbin/pkg_add/OpenBSD | |
| parent | c7f3bc19fe647a70d8baa1696eb6bc7b739d0255 (diff) | |
share common code for system libs.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 854316945cc..e07cd49a6d2 100644 --- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm +++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Dependencies.pm,v 1.12 2007/05/02 15:17:36 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.13 2007/05/07 08:06:47 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -161,13 +161,11 @@ sub lookup_library if ($harder && $lib !~ m|/|) { OpenBSD::SharedLibs::add_system_libs($state->{destdir}); - if (check_lib_spec("/usr", $lib, {system => 1})) { - print "found libspec $lib in /usr\n" if $state->{very_verbose}; - return 1; - } - if (check_lib_spec("/usr/X11R6", $lib, {system => 1})) { - print "found libspec $lib in /usr/X11R6\n" if $state->{very_verbose}; - return 1; + for my $dir ("/usr", "/usr/X11R6") { + if (check_lib_spec($dir, $lib, {system => 1})) { + print "found libspec $lib in $dir/lib\n" if $state->{very_verbose}; + return 1; + } } } for my $dep (@{$plist->{depends}}) { |