diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 5035b60374fc6a61fd68b7c4cee112ccf0ab4f9d..12528d9ba400ee8203f58365ba6508243de6b9e9 100755 (executable)
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
print "Path before: $Path\n";
# Don't alter path if we're building off a repository tree;
- # SunOS make will work only out of snapshots and releases.
+ # SunOS make will be used only for snapshots and releases.
if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) {
$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
}
sub configure {
# Configure
- print LOG "./configure $ConfigureArgs\n";
- open (CONFIGURE, "./configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+ print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
+ open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
while (<CONFIGURE>) {
print $_;
print LOG $_;
sub maketest {
# Tests
- print LOG "LANG=C make test 2>&1\n";
- open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
+ print LOG "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1\n";
+ open( MAKE, "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
while ( <MAKE> ) {
print $_;
print LOG $_;