diff options
| author | mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> | 2010-02-25 18:42:18 +0000 |
|---|---|---|
| committer | mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> | 2010-02-25 18:42:18 +0000 |
| commit | b59ee4abcf562409786536b340223f075a83a09f (patch) | |
| tree | 40ab897f6dda37a676b96d87f5a9263e7db14a39 | |
| parent | 8d4155d9271fc7aba8b7c3ede1970a058d688874 (diff) | |
Update paths for both console and conmux-registry to include BIN/../lib
and BIN/lib
Similar to how the script 'conmux' finds Conmux.pm do the same for console and
conmux-registry.
This is necessary because in a true install the library is located in
BASE_INSTALL/lib not BASE_INSTALL/bin.
In the autotest directory (where lots of people use the binary
directly). Conmux.pm is located where the console binary is located.
Signed-off-by: Scott Zawalski <scottz@google.com>
git-svn-id: svn://test.kernel.org/autotest/trunk@4267 592f7852-d20e-0410-864c-8624ca9c26a4
| -rwxr-xr-x | conmux/conmux-registry | 2 | ||||
| -rwxr-xr-x | conmux/console | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/conmux/conmux-registry b/conmux/conmux-registry index 1f7a4171..4af59f75 100755 --- a/conmux/conmux-registry +++ b/conmux/conmux-registry @@ -22,6 +22,8 @@ use URI::Escape; # Find our internal libraries. use lib $FindBin::Bin; +use lib "$FindBin::Bin/../lib/"; +use lib "$FindBin::Bin/lib/"; use Conmux; our $P = 'conmux-registry'; diff --git a/conmux/console b/conmux/console index 0ab1ad7f..f031e5b2 100755 --- a/conmux/console +++ b/conmux/console @@ -26,6 +26,8 @@ my $CONMUX = $ENV{'CONMUX_ROOT'} if ($ENV{'CONMUX_ROOT'}); # Find our internal libraries. use lib $FindBin::Bin; +use lib "$FindBin::Bin/../lib/"; +use lib "$FindBin::Bin/lib/"; use Conmux; # Basic terminal handling. |