summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-04-02 17:26:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:44 -0500
commitc09f40214ec068e4dbf915222f13cbe86f96582c (patch)
treefafd13ca4c49bfd5dbcf99ffa5afacf93050a637
parent2e588454fe160b39bd8134a2fb9cbac4fba39e2a (diff)
downloadsamba-c09f40214ec068e4dbf915222f13cbe86f96582c.tar.gz
samba-c09f40214ec068e4dbf915222f13cbe86f96582c.tar.bz2
samba-c09f40214ec068e4dbf915222f13cbe86f96582c.zip
r22036: Make sure both srcdir and builddir are in VPATH.
(This used to be commit 9400f07738eeedb08f38426964ac23b5d4312de9)
-rw-r--r--source4/build/smb_build/makefile.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 926d83f0f7..3cf764bf22 100644
--- 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)