summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/makefile.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 17:40:45 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-16 17:40:45 +0100
commit7b81f287a0389087134cc54b00486541c4b06c43 (patch)
treeb583b076696e33d0443c92d72556b03473b91e22 /source4/build/smb_build/makefile.pm
parentc74937009018fe229fa59d65468211f456d999f4 (diff)
downloadsamba-7b81f287a0389087134cc54b00486541c4b06c43.tar.gz
samba-7b81f287a0389087134cc54b00486541c4b06c43.tar.bz2
samba-7b81f287a0389087134cc54b00486541c4b06c43.zip
Remove some unused code.
(This used to be commit 8214fb600ec626a8dd01ef3e2af1f4a8bf27dcb2)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r--source4/build/smb_build/makefile.pm15
1 files changed, 4 insertions, 11 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 4498d9f019..4778c901d3 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -296,28 +296,21 @@ sub Binary($$)
{
my ($self,$ctx) = @_;
- my $installdir;
- my $extradir = "";
-
- my $localdir = "bin$extradir";
-
- $installdir = "bin$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:: $localdir/$ctx->{BINARY}\n");
+ $self->output("binaries:: bin/$ctx->{BINARY}\n");
$self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
$self->output(<< "__EOD__"
-$installdir/$ctx->{BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST)
+bin/$ctx->{BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST)
\@echo Linking \$\@
__EOD__
);