mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
r14562: Use VPATH to solve strange heimdal dependencies
(This used to be commit 4d09ffa7f1
)
This commit is contained in:
parent
afabd8dc6c
commit
c2c7971119
@ -64,7 +64,7 @@ sub _prepare_path_vars($)
|
|||||||
prefix = $self->{config}->{prefix}
|
prefix = $self->{config}->{prefix}
|
||||||
exec_prefix = $self->{config}->{exec_prefix}
|
exec_prefix = $self->{config}->{exec_prefix}
|
||||||
selftest_prefix = $self->{config}->{selftest_prefix}
|
selftest_prefix = $self->{config}->{selftest_prefix}
|
||||||
VPATH = $self->{config}->{srcdir}
|
VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb
|
||||||
srcdir = $self->{config}->{srcdir}
|
srcdir = $self->{config}->{srcdir}
|
||||||
builddir = $self->{config}->{builddir}
|
builddir = $self->{config}->{builddir}
|
||||||
|
|
||||||
|
@ -21,9 +21,8 @@ if (not defined $options) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $header = "$dirname/$prefix.h";
|
my $header = "$dirname/$prefix.h";
|
||||||
my $short_header = "$prefix.h";
|
|
||||||
|
|
||||||
print "$short_header $header: $file bin/asn1_compile\n";
|
print "$header: $file bin/asn1_compile\n";
|
||||||
print "\t\@echo \"Compiling ASN1 file $file\"\n";
|
print "\t\@echo \"Compiling ASN1 file $file\"\n";
|
||||||
print "\t\@cd $dirname && ../../../bin/asn1_compile $options $basename $prefix\n\n";
|
print "\t\@cd $dirname && ../../../bin/asn1_compile $options $basename $prefix\n\n";
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ my $basename = basename($file);
|
|||||||
|
|
||||||
my $header = $file; $header =~ s/\.et$/.h/;
|
my $header = $file; $header =~ s/\.et$/.h/;
|
||||||
my $source = $file; $source =~ s/\.et$/.c/;
|
my $source = $file; $source =~ s/\.et$/.c/;
|
||||||
my $short_header = $header; $short_header =~ s/(.*)\///g;
|
print "$header $source: $file bin/compile_et\n";
|
||||||
print "$short_header $header $source: $file bin/compile_et\n";
|
|
||||||
print "\t\@echo \"Compiling error table $file\"\n";
|
print "\t\@echo \"Compiling error table $file\"\n";
|
||||||
print "\t\@cd $dirname && ../../../bin/compile_et $basename\n\n";
|
print "\t\@cd $dirname && ../../../bin/compile_et $basename\n\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user