r22036: Make sure both srcdir and builddir are in VPATH.

(This used to be commit 9400f07738eeedb08f38426964ac23b5d4312de9)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 926d83f0f7604af2e1cc188cca3944c381945441..3cf764bf2233e0a0905a8e93aa7765dfbb1c35c8 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -71,11 +71,13 @@ sub _prepare_path_vars($)
 prefix = $self->{config}->{prefix}
 exec_prefix = $self->{config}->{exec_prefix}
 selftest_prefix = $self->{config}->{selftest_prefix}
-srcdir = $self->{config}->{srcdir}
-VPATH = \$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
+
 builddir = $self->{config}->{builddir}
+srcdir = $self->{config}->{srcdir}
 datarootdir = $self->{config}->{datarootdir}
 
+VPATH = \$(builddir):\$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
+
 BASEDIR = $self->{config}->{prefix}
 BINDIR = $self->{config}->{bindir}
 SBINDIR = $self->{config}->{sbindir}
@@ -329,7 +331,7 @@ sub StaticLibrary($$)
        $self->_prepare_list($ctx, "FULL_OBJ_LIST");
 
        push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
-               
+
        $self->output(<< "__EOD__"
 #
 $ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)