[Box Backup-commit] COMMIT r1074 - in box/chris/general: . test/bbackupd/testfiles
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Mon Oct 16 22:34:34 BST 2006
Author: chris
Date: 2006-10-16 22:34:33 +0100 (Mon, 16 Oct 2006)
New Revision: 1074
Modified:
box/chris/general/configure.ac
box/chris/general/test/bbackupd/testfiles/bbackupd.conf.in
box/chris/general/test/bbackupd/testfiles/notifyscript.pl.in
box/chris/general/test/bbackupd/testfiles/syncallowscript.pl.in
Log:
Use @TARGET_PERL@ for a Perl that works on the target platform (instead
of the host), important for Win32 native builds (requested by Martin).
Modified: box/chris/general/configure.ac
===================================================================
--- box/chris/general/configure.ac 2006-10-16 19:28:43 UTC (rev 1073)
+++ box/chris/general/configure.ac 2006-10-16 21:34:33 UTC (rev 1074)
@@ -31,16 +31,17 @@
case $target_os in
mingw*)
- AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["perl"], [Command to run Perl])
- PERL_NATIVE=perl
- AC_SUBST([PERL_NATIVE])
+ TARGET_PERL=perl
;;
*)
- AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"],
- [Location of the perl executable])
+ TARGET_PERL=$PERL
;;
esac
+AC_SUBST([TARGET_PERL])
+AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$TARGET_PERL"],
+ [Location of the perl executable])
+
### Checks for libraries.
case $target_os in
Modified: box/chris/general/test/bbackupd/testfiles/bbackupd.conf.in
===================================================================
--- box/chris/general/test/bbackupd/testfiles/bbackupd.conf.in 2006-10-16 19:28:43 UTC (rev 1073)
+++ box/chris/general/test/bbackupd/testfiles/bbackupd.conf.in 2006-10-16 21:34:33 UTC (rev 1074)
@@ -23,8 +23,8 @@
CommandSocket = testfiles/bbackupd.sock
-NotifyScript = @PERL_NATIVE@ testfiles/notifyscript.pl
-SyncAllowScript = @PERL_NATIVE@ testfiles/syncallowscript.pl
+NotifyScript = @TARGET_PERL@ testfiles/notifyscript.pl
+SyncAllowScript = @TARGET_PERL@ testfiles/syncallowscript.pl
Server
{
Modified: box/chris/general/test/bbackupd/testfiles/notifyscript.pl.in
===================================================================
--- box/chris/general/test/bbackupd/testfiles/notifyscript.pl.in 2006-10-16 19:28:43 UTC (rev 1073)
+++ box/chris/general/test/bbackupd/testfiles/notifyscript.pl.in 2006-10-16 21:34:33 UTC (rev 1074)
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@TARGET_PERL@
my $f = 'testfiles/notifyran.'.$ARGV[0].'.';
Modified: box/chris/general/test/bbackupd/testfiles/syncallowscript.pl.in
===================================================================
--- box/chris/general/test/bbackupd/testfiles/syncallowscript.pl.in 2006-10-16 19:28:43 UTC (rev 1073)
+++ box/chris/general/test/bbackupd/testfiles/syncallowscript.pl.in 2006-10-16 21:34:33 UTC (rev 1074)
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@TARGET_PERL@
use strict;
use warnings;
More information about the Boxbackup-commit
mailing list