diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 16:38:01 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 16:38:01 +0100 |
| commit | 0af55cac0386a597e40f88fa205f6a8ab08f2aee (patch) | |
| tree | 1f6c9b7c55e7840849e6ddc3971be459666f8a01 | |
| parent | c3633118127ea354ac0bc262f1ed2b6dc49160b1 (diff) | |
| download | samba-0af55cac0386a597e40f88fa205f6a8ab08f2aee.tar.gz samba-0af55cac0386a597e40f88fa205f6a8ab08f2aee.tar.bz2 samba-0af55cac0386a597e40f88fa205f6a8ab08f2aee.zip | |
Create SBIN_PROGS and BIN_PROGS lists from within make.
(This used to be commit 62abd38725ecbe149075a5e2097a08981cd156cf)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 7a007c4706..d2982c723b 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} = []; @@ -323,9 +321,9 @@ sub Binary($$) unless (defined($ctx->{INSTALLDIR})) { } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") { - push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}"); + $self->output("SBIN_PROGS += $installdir/$ctx->{BINARY}\n"); } elsif ($ctx->{INSTALLDIR} eq "BINDIR") { - push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}"); + $self->output("BIN_PROGS += $installdir/$ctx->{BINARY}\n"); } $self->output("binaries:: $localdir/$ctx->{BINARY}\n"); @@ -421,8 +419,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"); |