diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 19:11:04 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 19:11:04 +0100 |
commit | f5be3c3184119ed8370aedc3de2cb4aed21e38cc (patch) | |
tree | 911a685951519f3ed423487a20e752fa420b0fb1 /source4/build/smb_build/makefile.pm | |
parent | 3f6a915f2bf18e20d22a75cd1320f6cd4358d709 (diff) | |
download | samba-f5be3c3184119ed8370aedc3de2cb4aed21e38cc.tar.gz samba-f5be3c3184119ed8370aedc3de2cb4aed21e38cc.tar.bz2 samba-f5be3c3184119ed8370aedc3de2cb4aed21e38cc.zip |
Merge env.pm into makefile.pm.
(This used to be commit 01a0d3e74404d382c3cb74dbe385a4e9115b9b74)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r-- | source4/build/smb_build/makefile.pm | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 8b5856648f..308c7f2aa6 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -6,21 +6,21 @@ # Released under the GNU GPL package smb_build::makefile; -use smb_build::env; use smb_build::output; use File::Basename; use strict; -use base 'smb_build::env'; use Cwd 'abs_path'; sub new($$$) { my ($myname, $config, $mkfile) = @_; - my $self = new smb_build::env($config); - + my $self = {}; + bless($self, $myname); + $self->_set_config($config); + $self->{output} = ""; $self->{mkfile} = $mkfile; @@ -33,6 +33,29 @@ sub new($$$) return $self; } +sub _set_config($$) +{ + my ($self, $config) = @_; + + $self->{config} = $config; + + if (not defined($self->{config}->{srcdir})) { + $self->{config}->{srcdir} = '.'; + } + + if (not defined($self->{config}->{builddir})) { + $self->{config}->{builddir} = '.'; + } + + if ($self->{config}->{prefix} eq "NONE") { + $self->{config}->{prefix} = $self->{config}->{ac_default_prefix}; + } + + if ($self->{config}->{exec_prefix} eq "NONE") { + $self->{config}->{exec_prefix} = $self->{config}->{prefix}; + } +} + sub output($$) { my ($self, $text) = @_; |