[Box Backup-dev] COMMIT r536 - in box/trunk: . bin/bbackupd bin/bbackupquery bin/bbstored distribution/boxbackup/contrib/cygwin infrastructure lib/backupclient lib/common lib/compress lib/crypto lib/raidfile lib/server test/backupstorefix test/backupstorefix/testfiles test/basicserver test/bbackupd/testfiles

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sat, 4 Mar 2006 01:34:00 +0000 (GMT)


Author: martin
Date: 2006-03-04 01:33:46 +0000 (Sat, 04 Mar 2006)
New Revision: 536

Modified:
   box/trunk/bin/bbackupd/bbackupd-config
   box/trunk/bin/bbackupquery/Makefile.extra
   box/trunk/bin/bbackupquery/makedocumentation.pl
   box/trunk/bin/bbstored/Makefile.extra
   box/trunk/bin/bbstored/bbstored-certs
   box/trunk/bin/bbstored/bbstored-config
   box/trunk/configure.ac
   box/trunk/distribution/boxbackup/contrib/cygwin/install-cygwin-service.pl
   box/trunk/infrastructure/makebuildenv.pl
   box/trunk/infrastructure/makedistribution.pl
   box/trunk/infrastructure/makeparcels.pl
   box/trunk/infrastructure/setupexternal.pl
   box/trunk/lib/backupclient/Makefile.extra
   box/trunk/lib/common/Makefile.extra
   box/trunk/lib/common/makeexception.pl
   box/trunk/lib/compress/Makefile.extra
   box/trunk/lib/crypto/Makefile.extra
   box/trunk/lib/raidfile/Makefile.extra
   box/trunk/lib/raidfile/raidfile-config
   box/trunk/lib/server/Makefile.extra
   box/trunk/lib/server/makeprotocol.pl
   box/trunk/runtest.pl
   box/trunk/test/backupstorefix/testbackupstorefix.cpp
   box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl
   box/trunk/test/basicserver/Makefile.extra
   box/trunk/test/bbackupd/testfiles/bbackupd.conf
   box/trunk/test/bbackupd/testfiles/extcheck1.pl
   box/trunk/test/bbackupd/testfiles/extcheck2.pl
   box/trunk/test/bbackupd/testfiles/notifyscript.pl
Log:
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.


Modified: box/trunk/bin/bbackupd/bbackupd-config
===================================================================
--- box/trunk/bin/bbackupd/bbackupd-config	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/bin/bbackupd/bbackupd-config	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # should be running as root

Modified: box/trunk/bin/bbackupquery/Makefile.extra
===================================================================
--- box/trunk/bin/bbackupquery/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/bin/bbackupquery/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,6 +1,6 @@
 
 # AUTOGEN SEEDING
 autogen_Documentation.cpp:	makedocumentation.pl documentation.txt
-	perl makedocumentation.pl
+	$(PERL) makedocumentation.pl
 
 

Modified: box/trunk/bin/bbackupquery/makedocumentation.pl
===================================================================
--- box/trunk/bin/bbackupquery/makedocumentation.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/bin/bbackupquery/makedocumentation.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 print "Creating built-in documentation for bbackupquery...\n";

Modified: box/trunk/bin/bbstored/Makefile.extra
===================================================================
--- box/trunk/bin/bbstored/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/bin/bbstored/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -5,5 +5,5 @@
 
 # AUTOGEN SEEDING
 autogen_BackupProtocolServer.cpp autogen_BackupProtocolServer.h:	$(MAKEPROTOCOL) backupprotocol.txt
-	perl $(GEN_CMD_SRV)
+	$(PERL) $(GEN_CMD_SRV)
 

Modified: box/trunk/bin/bbstored/bbstored-certs
===================================================================
--- box/trunk/bin/bbstored/bbstored-certs	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/bin/bbstored/bbstored-certs	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # validity period for root certificates -- default is a very long time

Modified: box/trunk/bin/bbstored/bbstored-config
===================================================================
--- box/trunk/bin/bbstored/bbstored-config	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/bin/bbstored/bbstored-config	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # should be running as root

Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/configure.ac	2006-03-04 01:33:46 UTC (rev 536)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk])
+AC_INIT([Box Backup], 0.10, [box@fluffy.co.uk])
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
 
@@ -26,6 +26,12 @@
   # Use -rdynamic if we have gcc. This is needed for backtrace
   AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
 fi
+AC_PATH_PROG([PERL], [perl], [no])
+if test "x$PERL" != "xno"; then
+  AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
+else
+  AC_MSG_ERROR([[perl executable was not found]])
+fi
 
 
 ### Checks for libraries.
@@ -203,13 +209,27 @@
 
 
 ### Output files
-AC_CONFIG_FILES([infrastructure/BoxPlatform.pm])
+AC_CONFIG_FILES([bin/bbackupd/bbackupd-config
+                 bin/bbackupquery/makedocumentation.pl
+                 bin/bbstored/bbstored-certs
+                 bin/bbstored/bbstored-config
+                 infrastructure/BoxPlatform.pm
+                 infrastructure/makebuildenv.pl
+                 infrastructure/makeparcels.pl
+                 lib/common/makeexception.pl
+                 lib/raidfile/raidfile-config
+                 lib/server/makeprotocol.pl
+                 runtest.pl
+                 test/backupstorefix/testfiles/testbackupstorefix.pl
+                 test/bbackupd/testfiles/extcheck1.pl
+                 test/bbackupd/testfiles/extcheck2.pl
+                 test/bbackupd/testfiles/notifyscript.pl])
 AC_OUTPUT
 
 # Configure the Box build system
 echo
-perl ./infrastructure/makebuildenv.pl &&
-  perl ./infrastructure/makeparcels.pl
+$PERL ./infrastructure/makebuildenv.pl &&
+  $PERL ./infrastructure/makeparcels.pl
 
 # Write summary of important info
 cat <<EOC

Modified: box/trunk/distribution/boxbackup/contrib/cygwin/install-cygwin-service.pl
===================================================================
--- box/trunk/distribution/boxbackup/contrib/cygwin/install-cygwin-service.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/distribution/boxbackup/contrib/cygwin/install-cygwin-service.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 
 
 # Contributed to the boxbackup project by Per Reedtz Thomsen. pthomsen@reedtz.com

Modified: box/trunk/infrastructure/makebuildenv.pl
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/infrastructure/makebuildenv.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 use Symbol;
 
@@ -497,6 +497,7 @@
 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

Modified: box/trunk/infrastructure/makedistribution.pl
===================================================================
--- box/trunk/infrastructure/makedistribution.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/infrastructure/makedistribution.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 use Symbol;
 

Modified: box/trunk/infrastructure/makeparcels.pl
===================================================================
--- box/trunk/infrastructure/makeparcels.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/infrastructure/makeparcels.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 use strict;
 use lib 'infrastructure';

Modified: box/trunk/infrastructure/setupexternal.pl
===================================================================
--- box/trunk/infrastructure/setupexternal.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/infrastructure/setupexternal.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # This script links in the essential directories and processes various

Modified: box/trunk/lib/backupclient/Makefile.extra
===================================================================
--- box/trunk/lib/backupclient/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/backupclient/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -5,12 +5,12 @@
 
 # AUTOGEN SEEDING
 autogen_BackupProtocolClient.cpp autogen_BackupProtocolClient.h:	$(MAKEPROTOCOL) ../../bin/bbstored/backupprotocol.txt
-	perl $(GEN_CMD_SRV)
+	$(PERL) $(GEN_CMD_SRV)
 
 
 MAKEEXCEPTION = ../../lib/common/makeexception.pl
 
 # AUTOGEN SEEDING
 autogen_BackupStoreException.h autogen_BackupStoreException.cpp:	$(MAKEEXCEPTION) BackupStoreException.txt
-	perl $(MAKEEXCEPTION) BackupStoreException.txt
+	$(PERL) $(MAKEEXCEPTION) BackupStoreException.txt
 

Modified: box/trunk/lib/common/Makefile.extra
===================================================================
--- box/trunk/lib/common/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/common/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -3,9 +3,9 @@
 
 # AUTOGEN SEEDING
 autogen_CommonException.h autogen_CommonException.cpp:	$(MAKEEXCEPTION) CommonException.txt
-	perl $(MAKEEXCEPTION) CommonException.txt
+	$(PERL) $(MAKEEXCEPTION) CommonException.txt
 
 # AUTOGEN SEEDING
 autogen_ConversionException.h autogen_ConversionException.cpp:	$(MAKEEXCEPTION) ConversionException.txt
-	perl $(MAKEEXCEPTION) ConversionException.txt
+	$(PERL) $(MAKEEXCEPTION) ConversionException.txt
 

Modified: box/trunk/lib/common/makeexception.pl
===================================================================
--- box/trunk/lib/common/makeexception.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/common/makeexception.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 # global exception list file
 my $global_list = '../../ExceptionCodes.txt';

Modified: box/trunk/lib/compress/Makefile.extra
===================================================================
--- box/trunk/lib/compress/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/compress/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_CompressException.h autogen_CompressException.cpp:	$(MAKEEXCEPTION) CompressException.txt
-	perl $(MAKEEXCEPTION) CompressException.txt
+	$(PERL) $(MAKEEXCEPTION) CompressException.txt
 

Modified: box/trunk/lib/crypto/Makefile.extra
===================================================================
--- box/trunk/lib/crypto/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/crypto/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_CipherException.cpp autogen_CipherException.h:	$(MAKEEXCEPTION) CipherException.txt
-	perl $(MAKEEXCEPTION) CipherException.txt
+	$(PERL) $(MAKEEXCEPTION) CipherException.txt
 

Modified: box/trunk/lib/raidfile/Makefile.extra
===================================================================
--- box/trunk/lib/raidfile/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/raidfile/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_RaidFileException.h autogen_RaidFileException.cpp:	$(MAKEEXCEPTION) RaidFileException.txt
-	perl $(MAKEEXCEPTION) RaidFileException.txt
+	$(PERL) $(MAKEEXCEPTION) RaidFileException.txt
 

Modified: box/trunk/lib/raidfile/raidfile-config
===================================================================
--- box/trunk/lib/raidfile/raidfile-config	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/raidfile/raidfile-config	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # should be running as root

Modified: box/trunk/lib/server/Makefile.extra
===================================================================
--- box/trunk/lib/server/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/server/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -3,9 +3,9 @@
 
 # AUTOGEN SEEDING
 autogen_ServerException.h autogen_ServerException.cpp:	$(MAKEEXCEPTION) ServerException.txt
-	perl $(MAKEEXCEPTION) ServerException.txt
+	$(PERL) $(MAKEEXCEPTION) ServerException.txt
 
 # AUTOGEN SEEDING
 autogen_ConnectionException.h autogen_ConnectionException.cpp:	$(MAKEEXCEPTION) ConnectionException.txt
-	perl $(MAKEEXCEPTION) ConnectionException.txt
+	$(PERL) $(MAKEEXCEPTION) ConnectionException.txt
 

Modified: box/trunk/lib/server/makeprotocol.pl
===================================================================
--- box/trunk/lib/server/makeprotocol.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/lib/server/makeprotocol.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 # Make protocol C++ classes from a protocol description file

Modified: box/trunk/runtest.pl
===================================================================
--- box/trunk/runtest.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/runtest.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 use lib 'infrastructure';
 use BoxPlatform;

Modified: box/trunk/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/trunk/test/backupstorefix/testbackupstorefix.cpp	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/backupstorefix/testbackupstorefix.cpp	2006-03-04 01:33:46 UTC (rev 536)
@@ -312,7 +312,7 @@
 		TEST_THAT(ServerIsAlive(pid));
 
 		// Run the perl script to create the initial directories
-		TEST_THAT_ABORTONFAIL(::system("perl testfiles/testbackupstorefix.pl init") == 0);
+		TEST_THAT_ABORTONFAIL(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl init") == 0);
 
 		int bbackupd_pid = LaunchServer("../../bin/bbackupd/bbackupd testfiles/bbackupd.conf", "testfiles/bbackupd.pid");
 		TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0);
@@ -367,7 +367,7 @@
 		// Fix it
 		RUN_CHECK
 		// Check everything is as it was
-		TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 0") == 0);
+		TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 0") == 0);
 		// Check the random file doesn't exist
 		{
 			TEST_THAT(!RaidFileRead::FileExists(discSetNum, storeRoot + "01/randomfile"));
@@ -425,7 +425,7 @@
 			// Fix it
 			RUN_CHECK
 			// Check
-			TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 1") == 0);
+			TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 1") == 0);
 
 			// Check the modified file doesn't exist
 			TEST_THAT(!RaidFileRead::FileExists(discSetNum, fn));
@@ -471,7 +471,7 @@
 		// Fix it
 		RUN_CHECK
 		// Check everything is as it should be
-		TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 2") == 0);
+		TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 2") == 0);
 		{
 			BackupStoreDirectory dir;
 			LoadDirectory("Test1/foreomizes/stemptinevidate/ict", dir);
@@ -527,7 +527,7 @@
 		// Fix it
 		RUN_CHECK
 		// Check everything is as it should be
-		TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 3") == 0);
+		TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 3") == 0);
 		{
 			BackupStoreDirectory dir;
 			LoadDirectory("Test1/foreomizes/stemptinevidate/ict", dir);
@@ -541,7 +541,7 @@
 		// Fix it
 		RUN_CHECK
 		// Check everything is where it is predicted to be
-		TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 4") == 0);
+		TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 4") == 0);
 
 		// ------------------------------------------------------------------------------------------------		
 		::printf("  === Corrupt file and dir\n");
@@ -552,7 +552,7 @@
 		// Fix it
 		RUN_CHECK
 		// Check everything is where it should be
-		TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 5") == 0);
+		TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 5") == 0);
 
 		// ------------------------------------------------------------------------------------------------		
 		::printf("  === Overwrite root with a file\n");
@@ -566,7 +566,7 @@
 		// Fix it
 		RUN_CHECK
 		// Check everything is where it should be
-		TEST_THAT(::system("perl testfiles/testbackupstorefix.pl reroot 6") == 0);
+		TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl reroot 6") == 0);
 
 
 		// ------------------------------------------------------------------------------------------------		

Modified: box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl
===================================================================
--- box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 my @words = split /\s+/,<<__E;

Modified: box/trunk/test/basicserver/Makefile.extra
===================================================================
--- box/trunk/test/basicserver/Makefile.extra	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/basicserver/Makefile.extra	2006-03-04 01:33:46 UTC (rev 536)
@@ -6,16 +6,16 @@
 
 # AUTOGEN SEEDING
 autogen_TestProtocolServer.cpp:	$(MAKEPROTOCOL) testprotocol.txt
-	perl $(GEN_CMD_SRV)
+	$(PERL) $(GEN_CMD_SRV)
 
 autogen_TestProtocolServer.h:	$(MAKEPROTOCOL) testprotocol.txt
-	perl $(GEN_CMD_SRV)
+	$(PERL) $(GEN_CMD_SRV)
 
 
 # AUTOGEN SEEDING
 autogen_TestProtocolClient.cpp:	$(MAKEPROTOCOL) testprotocol.txt
-	perl $(GEN_CMD_CLI)
+	$(PERL) $(GEN_CMD_CLI)
 
 autogen_TestProtocolClient.h:	$(MAKEPROTOCOL) testprotocol.txt
-	perl $(GEN_CMD_CLI)
+	$(PERL) $(GEN_CMD_CLI)
 

Modified: box/trunk/test/bbackupd/testfiles/bbackupd.conf
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/bbackupd/testfiles/bbackupd.conf	2006-03-04 01:33:46 UTC (rev 536)
@@ -23,7 +23,7 @@
 
 CommandSocket = testfiles/bbackupd.sock
 
-NotifyScript = perl testfiles/notifyscript.pl
+NotifyScript = @PERL@ testfiles/notifyscript.pl
 
 Server
 {

Modified: box/trunk/test/bbackupd/testfiles/extcheck1.pl
===================================================================
--- box/trunk/test/bbackupd/testfiles/extcheck1.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/bbackupd/testfiles/extcheck1.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 unless(open IN,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query4.log \"compare -ac\" quit|")

Modified: box/trunk/test/bbackupd/testfiles/extcheck2.pl
===================================================================
--- box/trunk/test/bbackupd/testfiles/extcheck2.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/bbackupd/testfiles/extcheck2.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 use strict;
 
 unless(open IN,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query4.log \"compare -ac\" quit|")

Modified: box/trunk/test/bbackupd/testfiles/notifyscript.pl
===================================================================
--- box/trunk/test/bbackupd/testfiles/notifyscript.pl	2006-02-28 21:35:00 UTC (rev 535)
+++ box/trunk/test/bbackupd/testfiles/notifyscript.pl	2006-03-04 01:33:46 UTC (rev 536)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 
 my $f = 'testfiles/notifyran.'.$ARGV[0].'.';