[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-741-gdf5b712

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  df5b712001c16acf275d9a79fd765cf8976508d6 (commit)
      from  0d44e7a15a9f7e238c0702a0135beae2183455a8 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit df5b712001c16acf275d9a79fd765cf8976508d6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 18:07:22 2008 +0100

    TORTUREDIR as target dir for binaries is no longer used, remove it.

-----------------------------------------------------------------------

Summary of changes:
 source/build/smb_build/makefile.pm |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 0393e2b..50a16c5 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -24,7 +24,6 @@ sub new($$$)
 	$self->{manpages} = [];
 	$self->{sbin_progs} = [];
 	$self->{bin_progs} = [];
-	$self->{torture_progs} = [];
 	$self->{static_libs} = [];
 	$self->{python_dsos} = [];
 	$self->{python_pys} = [];
@@ -340,9 +339,6 @@ sub Binary($$)
 	my $installdir;
 	my $extradir = "";
 
-	if (defined($ctx->{INSTALLDIR}) && $ctx->{INSTALLDIR} =~ /^TORTUREDIR/) {
-		$extradir = "/torture" . substr($ctx->{INSTALLDIR}, length("TORTUREDIR"));
-	}
 	my $localdir = "bin$extradir";
 
 	$installdir = "bin$extradir";
@@ -354,8 +350,6 @@ sub Binary($$)
 		push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}");
 	} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
 		push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}");
-	} elsif ($ctx->{INSTALLDIR} =~ /^TORTUREDIR/) {
-		push (@{$self->{torture_progs}}, "$installdir/$ctx->{BINARY}");
 	}
 
 	push (@{$self->{binaries}}, "$localdir/$ctx->{BINARY}");
@@ -455,7 +449,6 @@ sub write($$)
 	$self->output("MANPAGES = ".array2oneperline($self->{manpages})."\n");
 	$self->output("BIN_PROGS = " . array2oneperline($self->{bin_progs}) . "\n");
 	$self->output("SBIN_PROGS = " . array2oneperline($self->{sbin_progs}) . "\n");
-	$self->output("TORTURE_PROGS = " . array2oneperline($self->{torture_progs}) . "\n");
 	$self->output("BINARIES = " . array2oneperline($self->{binaries}) . "\n");
 	$self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n");
 	$self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n");


-- 
Samba Shared Repository