summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-10-16 23:09:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:14 -0500
commitb58deeea692fc28827e249f0fc4a9d39263a4095 (patch)
treeb4e7ddc76fd026977803d4d067dc307e7e9d48e7 /source4/build/smb_build
parentc2d6fad69bc42c0d7c261282797ca8baf9e9aad2 (diff)
downloadsamba-b58deeea692fc28827e249f0fc4a9d39263a4095.tar.gz
samba-b58deeea692fc28827e249f0fc4a9d39263a4095.tar.bz2
samba-b58deeea692fc28827e249f0fc4a9d39263a4095.zip
r19350: Properly list LOCAL-TALLOC under the "LOCAL" header.
Support directories for subcategories in tests. Several small other fixes. (This used to be commit bde00d97068d559b025ab131ff698a82430d14b3)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/makefile.pm15
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0d448773a6..91ee7186a5 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -366,18 +366,17 @@ sub Binary($$)
my ($self,$ctx) = @_;
my $installdir;
- my $localdir;
+ my $extradir = "";
- if (defined($ctx->{INSTALLDIR}) && $ctx->{INSTALLDIR} eq "TORTUREDIR") {
- $localdir = "bin/torture";
- } else {
- $localdir = "bin";
+ if (defined($ctx->{INSTALLDIR}) && $ctx->{INSTALLDIR} =~ /^TORTUREDIR/) {
+ $extradir = "/torture" . substr($ctx->{INSTALLDIR}, length("TORTUREDIR"));
}
+ my $localdir = "bin$extradir";
if ($self->{duplicate_build}) {
- $installdir = "bin/install";
+ $installdir = "bin/install$extradir";
} else {
- $installdir = $localdir;
+ $installdir = "bin$extradir";
}
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
@@ -387,7 +386,7 @@ sub Binary($$)
push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}");
- } elsif ($ctx->{INSTALLDIR} eq "TORTUREDIR") {
+ } elsif ($ctx->{INSTALLDIR} =~ /^TORTUREDIR/) {
push (@{$self->{torture_progs}}, "$installdir/$ctx->{BINARY}");
}