Import upstream version 0.11~rc8~r2714

1 files changed, 14 insertions, 5 deletions

diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in
index 5ed4a0ab..9f53e2c6 100755
--- a/infrastructure/makebuildenv.pl.in
+++ b/infrastructure/makebuildenv.pl.in
@@ -55,7 +55,7 @@ while(<FINDAUTOGEN>)
 	my $dir = $1;
 	open FL,$file or die "Can't open $_ for reading";
 	my %vars;
-	$vars{PERL} = "@PERL@";
+	$vars{_PERL} = "@PERL@";
 	my $do_cmds = 0;
 	while(<FL>)
 	{
@@ -428,9 +428,16 @@ __E
 			if (-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
+kill_daemons()
+{
+	kill_process bbackupd
+	kill_process bbstored
+	kill_process httpserver
+	kill_process s3simulator
+}
+
 echo Killing any running daemons...
-kill_process bbackupd
-kill_process bbstored
+kill_daemons
 __E
 			}
 
@@ -457,8 +464,7 @@ __E
 			if (-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
-kill_process bbackupd
-kill_process bbstored
+kill_daemons
 __E
 			}
 
@@ -584,6 +590,7 @@ _LINK    = \$(CXX)
 _WINDRES = \$(WINDRES)
 _AR      = \$(AR)
 _RANLIB  = \$(RANLIB)
+_PERL    = \$(PERL)
 .else
 HIDE     = @
 _CXX     = @ echo "  [CXX]    " \$(*F) && \$(CXX)
@@ -591,6 +598,7 @@ _LINK    = @ echo "  [LINK]   " \$(*F) && \$(CXX)
 _WINDRES = @ echo "  [WINDRES]" \$(*F) && \$(WINDRES)
 _AR      = @ echo "  [AR]     " \$(*F) && \$(AR)
 _RANLIB  = @ echo "  [RANLIB] " \$(*F) && \$(RANLIB)
+_PERL    = @ echo "  [PERL]   " \$(*F) && \$(PERL) >/dev/null
 .endif
 
 __E
@@ -604,6 +612,7 @@ _LINK    = \$(if \$(V),\$(CXX),     @ echo "  [LINK]    \$@" && \$(CXX))
 _WINDRES = \$(if \$(V),\$(WINDRES), @ echo "  [WINDRES] \$<" && \$(WINDRES))
 _AR      = \$(if \$(V),\$(AR),      @ echo "  [AR]      \$@" && \$(AR))
 _RANLIB  = \$(if \$(V),\$(RANLIB),  @ echo "  [RANLIB]  \$@" && \$(RANLIB))
+_PERL    = \$(if \$(V),\$(PERL),    @ echo "  [PERL]    \$@" && \$(PERL) >/dev/null)
 
 __E
 	}