From 238ab41ba192e577da3192e0b6bfd608368c3f3b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 23 Sep 2008 22:15:10 +0000 Subject: [PATCH] Use $FindBin::Bin instead of expanding @TOP@. --- src/cap5/{CA.pm@ => CA.pm} | 3 ++- src/cap5/Makefile | 2 -- src/cap5/{caget.pl@ => caget.pl} | 5 ++++- src/cap5/{cainfo.pl@ => cainfo.pl} | 5 ++++- src/cap5/{camonitor.pl@ => camonitor.pl} | 5 ++++- src/cap5/{caput.pl@ => caput.pl} | 5 ++++- 6 files changed, 18 insertions(+), 7 deletions(-) rename src/cap5/{CA.pm@ => CA.pm} (99%) rename src/cap5/{caget.pl@ => caget.pl} (98%) rename src/cap5/{cainfo.pl@ => cainfo.pl} (96%) rename src/cap5/{camonitor.pl@ => camonitor.pl} (98%) rename src/cap5/{caput.pl@ => caput.pl} (98%) diff --git a/src/cap5/CA.pm@ b/src/cap5/CA.pm similarity index 99% rename from src/cap5/CA.pm@ rename to src/cap5/CA.pm index c29dda585..15e5b5f9f 100644 --- a/src/cap5/CA.pm@ +++ b/src/cap5/CA.pm @@ -29,7 +29,8 @@ our @ISA = qw(DynaLoader); require DynaLoader; # Add our lib/ directory to the library search path -push @DynaLoader::dl_library_path, '@TOP@/lib/'.$ENV{EPICS_HOST_ARCH}; +use FindBin qw($Bin); +push @DynaLoader::dl_library_path, "$Bin/../../lib/$ENV{EPICS_HOST_ARCH}"; bootstrap Cap5 $VERSION; diff --git a/src/cap5/Makefile b/src/cap5/Makefile index 069df4617..9f052e278 100644 --- a/src/cap5/Makefile +++ b/src/cap5/Makefile @@ -21,8 +21,6 @@ ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32 LOADABLE_LIBRARY_HOST = Cap5 - EXPAND += cainfo.pl@ caput.pl@ caget.pl@ camonitor.pl@ CA.pm@ - PERL_SCRIPTS += cainfo.pl PERL_SCRIPTS += caput.pl PERL_SCRIPTS += caget.pl diff --git a/src/cap5/caget.pl@ b/src/cap5/caget.pl similarity index 98% rename from src/cap5/caget.pl@ rename to src/cap5/caget.pl index 8f5cf6c31..c83fa02e0 100644 --- a/src/cap5/caget.pl@ +++ b/src/cap5/caget.pl @@ -1,7 +1,10 @@ #!/usr/bin/perl use strict; -use lib '@TOP@/lib/perl'; + +use FindBin qw($Bin); +use lib "$Bin/../../lib/perl"; + use Getopt::Std; use CA; diff --git a/src/cap5/cainfo.pl@ b/src/cap5/cainfo.pl similarity index 96% rename from src/cap5/cainfo.pl@ rename to src/cap5/cainfo.pl index 301f1a979..1c0d1473d 100644 --- a/src/cap5/cainfo.pl@ +++ b/src/cap5/cainfo.pl @@ -1,7 +1,10 @@ #!/usr/bin/perl use strict; -use lib '@TOP@/lib/perl'; + +use FindBin qw($Bin); +use lib "$Bin/../../lib/perl"; + use Getopt::Std; use CA; diff --git a/src/cap5/camonitor.pl@ b/src/cap5/camonitor.pl similarity index 98% rename from src/cap5/camonitor.pl@ rename to src/cap5/camonitor.pl index c570df38b..a1e30685f 100644 --- a/src/cap5/camonitor.pl@ +++ b/src/cap5/camonitor.pl @@ -1,7 +1,10 @@ #!/usr/bin/perl use strict; -use lib '@TOP@/lib/perl'; + +use FindBin qw($Bin); +use lib "$Bin/../../lib/perl"; + use Getopt::Std; use CA; diff --git a/src/cap5/caput.pl@ b/src/cap5/caput.pl similarity index 98% rename from src/cap5/caput.pl@ rename to src/cap5/caput.pl index bd9b367f3..208bf4ae9 100644 --- a/src/cap5/caput.pl@ +++ b/src/cap5/caput.pl @@ -1,7 +1,10 @@ #!/usr/bin/perl use strict; -use lib '@TOP@/lib/perl'; + +use FindBin qw($Bin); +use lib "$Bin/../../lib/perl"; + use Getopt::Std; use CA;