summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 16:38:01 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 13:44:03 +0100
commit581167ddd7153e59c94d0eb2709cd7719a13ca25 (patch)
tree9ac69d70123bbc2daac9596d9d98ce74cef45aa5
parent09447777d0c1a00daced1c63c3614136acfbe53f (diff)
downloadsamba-581167ddd7153e59c94d0eb2709cd7719a13ca25.tar.gz
samba-581167ddd7153e59c94d0eb2709cd7719a13ca25.tar.bz2
samba-581167ddd7153e59c94d0eb2709cd7719a13ca25.zip
Create SBIN_PROGS and BIN_PROGS lists from within make.
(This used to be commit e0afbc3778ca7c6dc087e2b9f4992a131ec66a75)
-rw-r--r--source4/build/smb_build/makefile.pm8
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index fa2d7883eb..8d7b41a404 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -22,8 +22,6 @@ sub new($$$)
bless($self, $myname);
$self->{manpages} = [];
- $self->{sbin_progs} = [];
- $self->{bin_progs} = [];
$self->{static_libs} = [];
$self->{python_dsos} = [];
$self->{python_pys} = [];
@@ -301,9 +299,9 @@ sub Binary($$)
unless (defined($ctx->{INSTALLDIR})) {
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
- push (@{$self->{sbin_progs}}, $ctx->{RESULT_BINARY});
+ $self->output("SBIN_PROGS += $installdir/$ctx->{BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
- push (@{$self->{bin_progs}}, $ctx->{RESULT_BINARY});
+ $self->output("BIN_PROGS += $installdir/$ctx->{BINARY}\n");
}
$self->output("binaries:: $ctx->{TARGET_BINARY}\n");
@@ -398,8 +396,6 @@ sub write($$)
my ($self, $file) = @_;
$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("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n");
$self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n");
$self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n");