Use $FindBin::Bin so we don't need to expand @TOP@.
Needed for package management systems such as in Debian.
This commit is contained in:
@@ -11,13 +11,6 @@ include $(TOP)/configure/CONFIG
|
||||
# Bootstrap resolution: tools not installed yet
|
||||
TOOLS = $(TOP)/src/tools
|
||||
|
||||
# Bootstrap resolution: expandVars.pl needs to be run on itself!
|
||||
EXPAND_TOOL = $(PERL) $(TOOLS)/expandVars.pl@
|
||||
|
||||
EXPAND += convertRelease.pl@
|
||||
EXPAND += expandVars.pl@
|
||||
EXPAND += fullPathName.pl@
|
||||
|
||||
PERL_MODULES += EPICS/Copy.pm
|
||||
PERL_MODULES += EPICS/Path.pm
|
||||
PERL_MODULES += EPICS/Release.pm
|
||||
|
||||
@@ -15,7 +15,9 @@ eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
|
||||
#
|
||||
|
||||
use strict;
|
||||
use lib '@TOP@/lib/perl';
|
||||
|
||||
use FindBin qw($Bin);
|
||||
use lib "$Bin/../../lib/perl";
|
||||
|
||||
use Cwd qw(cwd abs_path);
|
||||
use Getopt::Std;
|
||||
@@ -9,16 +9,11 @@
|
||||
# $Id$
|
||||
#
|
||||
|
||||
BEGIN {
|
||||
# Do not copy this BEGIN code for other tools,
|
||||
# it's only needed so expandVars can bootstrap itself.
|
||||
our $libperl = '@TOP@/lib/perl';
|
||||
$libperl = '..' if ($libperl =~ m/^[@]TOP[@]/);
|
||||
}
|
||||
use lib $libperl;
|
||||
|
||||
use strict;
|
||||
|
||||
use FindBin qw($Bin);
|
||||
use lib "$Bin/../../lib/perl";
|
||||
|
||||
use EPICS::Getopts;
|
||||
use EPICS::Path;
|
||||
use EPICS::Release;
|
||||
@@ -15,7 +15,9 @@ eval 'exec perl -S -w $0 ${1+"$@"}' # -*- Mode: perl -*-
|
||||
|
||||
use strict;
|
||||
|
||||
use lib '@TOP@/lib/perl';
|
||||
use FindBin qw($Bin);
|
||||
use lib "$Bin/../../lib/perl";
|
||||
|
||||
use EPICS::Path;
|
||||
|
||||
print AbsPath(shift), "\n";
|
||||
Reference in New Issue
Block a user