From 516a2cbf4181d1ab31dd33447fdc722754973fa8 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 23 Sep 2008 22:13:52 +0000
Subject: [PATCH] Use $FindBin::Bin so we don't need to expand @TOP@. Needed
 for package management systems such as in Debian.

---
 src/tools/Makefile                                  |  7 -------
 src/tools/{convertRelease.pl@ => convertRelease.pl} |  4 +++-
 src/tools/{expandVars.pl@ => expandVars.pl}         | 11 +++--------
 src/tools/{fullPathName.pl@ => fullPathName.pl}     |  4 +++-
 4 files changed, 9 insertions(+), 17 deletions(-)
 rename src/tools/{convertRelease.pl@ => convertRelease.pl} (99%)
 rename src/tools/{expandVars.pl@ => expandVars.pl} (86%)
 rename src/tools/{fullPathName.pl@ => fullPathName.pl} (92%)

diff --git a/src/tools/Makefile b/src/tools/Makefile
index e24c51687..4dfc7aa1d 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -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
diff --git a/src/tools/convertRelease.pl@ b/src/tools/convertRelease.pl
similarity index 99%
rename from src/tools/convertRelease.pl@
rename to src/tools/convertRelease.pl
index eb18104b0..9f6a94fcf 100755
--- a/src/tools/convertRelease.pl@
+++ b/src/tools/convertRelease.pl
@@ -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;
diff --git a/src/tools/expandVars.pl@ b/src/tools/expandVars.pl
similarity index 86%
rename from src/tools/expandVars.pl@
rename to src/tools/expandVars.pl
index 643dcbd6e..082386de4 100644
--- a/src/tools/expandVars.pl@
+++ b/src/tools/expandVars.pl
@@ -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;
diff --git a/src/tools/fullPathName.pl@ b/src/tools/fullPathName.pl
similarity index 92%
rename from src/tools/fullPathName.pl@
rename to src/tools/fullPathName.pl
index 65adf3d1e..b6da757ff 100755
--- a/src/tools/fullPathName.pl@
+++ b/src/tools/fullPathName.pl
@@ -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";