diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 13:58:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 13:58:20 +0100 |
| commit | eff6a8c25671c9955159b15e3d36734f6a6b327c (patch) | |
| tree | ffb500e7982c3178e31468e5b631821196566c06 /source4/build/smb_build/makefile.pm | |
| parent | 2219d434ed54f4ba82ac141dafcb10f7f7762d73 (diff) | |
| download | samba-eff6a8c25671c9955159b15e3d36734f6a6b327c.tar.gz samba-eff6a8c25671c9955159b15e3d36734f6a6b327c.tar.bz2 samba-eff6a8c25671c9955159b15e3d36734f6a6b327c.zip | |
Avoid use of removed variable.
(This used to be commit 10f0b5f83f0b34ae9d0f83c0975cf06bf56277d4)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 96ab789b70..9fedfe9df2 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -291,13 +291,11 @@ sub Binary($$) { my ($self,$ctx) = @_; - my $extradir = ""; - unless (defined($ctx->{INSTALLDIR})) { } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") { - $self->output("SBIN_PROGS += $installdir/$ctx->{BINARY}\n"); + $self->output("SBIN_PROGS += bin/$ctx->{BINARY}\n"); } elsif ($ctx->{INSTALLDIR} eq "BINDIR") { - $self->output("BIN_PROGS += $installdir/$ctx->{BINARY}\n"); + $self->output("BIN_PROGS += bin/$ctx->{BINARY}\n"); } $self->output("binaries:: $ctx->{TARGET_BINARY}\n"); |