mirror of
https://github.com/samba-team/samba.git
synced 2025-03-10 12:58:35 +03:00
r22036: Make sure both srcdir and builddir are in VPATH.
This commit is contained in:
parent
976343821b
commit
9400f07738
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user