This is part 1 of a patch from James O'Gorman.

configure now detects perl executable location and updates all scripts to use the correct path; also adds PERL_EXECUTABLE define to BoxConfig.h. makebuildenv.pl adds PERL define to all makefiles.

4 files changed, 5 insertions, 4 deletions

diff --git a/infrastructure/makebuildenv.pl b/infrastructure/makebuildenv.pl
index 7ce2e138..29479558 100755
--- a/infrastructure/makebuildenv.pl
+++ b/infrastructure/makebuildenv.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 use Symbol;
 
@@ -497,6 +497,7 @@ __E
 CXX = g++
 AR = ar
 RANLIB = ranlib
+PERL = \@PERL\@
 .ifdef RELEASE
 CXXFLAGS = -DNDEBUG $release_flags -Wall $include_paths $extra_platform_defines -DBOX_VERSION="\\"$product_version\\""
 OUTBASE = ../../release
diff --git a/infrastructure/makedistribution.pl b/infrastructure/makedistribution.pl
index 22057959..16f7409b 100755
--- a/infrastructure/makedistribution.pl
+++ b/infrastructure/makedistribution.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 use Symbol;
 
diff --git a/infrastructure/makeparcels.pl b/infrastructure/makeparcels.pl
index deea24af..e70dcf29 100755
--- a/infrastructure/makeparcels.pl
+++ b/infrastructure/makeparcels.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 use strict;
 use lib 'infrastructure';
diff --git a/infrastructure/setupexternal.pl b/infrastructure/setupexternal.pl
index e21403e1..87ec5560 100755
--- a/infrastructure/setupexternal.pl
+++ b/infrastructure/setupexternal.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # This script links in the essential directories and processes various