diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-12-30 19:18:51 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:04 -0500 |
commit | 83acc688e3cb21d3fe25129f1fa1522872e6eec2 (patch) | |
tree | 093ee254dd6ffb0da50e745cb4c70241c94aecb5 /source4/build/smb_build/env.pm | |
parent | 87a97acdfecbeb3651112639d2bb7eab3372171e (diff) | |
download | samba-83acc688e3cb21d3fe25129f1fa1522872e6eec2.tar.gz samba-83acc688e3cb21d3fe25129f1fa1522872e6eec2.tar.bz2 samba-83acc688e3cb21d3fe25129f1fa1522872e6eec2.zip |
r12615: prepare building with ../samba4/source/configure --srcdir=../samba4/source/
metze
(This used to be commit bf35c74218476fc568e251bb337e794ed9d51fac)
Diffstat (limited to 'source4/build/smb_build/env.pm')
-rw-r--r-- | source4/build/smb_build/env.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm index 1ad8e23d36..09d8eb1536 100644 --- a/source4/build/smb_build/env.pm +++ b/source4/build/smb_build/env.pm @@ -31,8 +31,13 @@ sub _set_config($$) $self->{config} = $config; - $self->{config}->{srcdir} = '.'; - $self->{config}->{builddir} = '.'; + 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}; |