summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 18:07:22 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 18:07:22 +0100
commit98fdbb61260b19bc97675336993f3fcb5f470f90 (patch)
treea4032b21532f29b956b1bd08c3b2647251939d64 /source4/build/smb_build
parent1cf6158f8563af06b530bcdf89dee4a1fa920121 (diff)
downloadsamba-98fdbb61260b19bc97675336993f3fcb5f470f90.tar.gz
samba-98fdbb61260b19bc97675336993f3fcb5f470f90.tar.bz2
samba-98fdbb61260b19bc97675336993f3fcb5f470f90.zip
TORTUREDIR as target dir for binaries is no longer used, remove it.
(This used to be commit df5b712001c16acf275d9a79fd765cf8976508d6)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/makefile.pm7
1 files changed, 0 insertions, 7 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0393e2b258..50a16c543f 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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");