From 14b0987c630a424546211c46b8a8c5ca3c038226 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 May 2008 15:38:13 +0200 Subject: use varibale for asn1 compiler. (This used to be commit 4543633ba046836d13da80d07d06c272c3abf9bc) --- source4/heimdal_build/asn1_deps.pl | 4 ++-- source4/heimdal_build/config.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl index 488404fcce..4910d47863 100755 --- a/source4/heimdal_build/asn1_deps.pl +++ b/source4/heimdal_build/asn1_deps.pl @@ -29,9 +29,9 @@ if (not defined $options) { my $header = "$dirname/$prefix.h"; -print "$header: \$(heimdalsrcdir)/$file bin/asn1_compile\n"; +print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n"; print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n"; -print "\t\@\$(builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/asn1_compile \$(heimdalsrcdir)/$file $prefix $options\n\n"; +print "\t\@\$(builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname \$(ASN1C) \$(heimdalsrcdir)/$file $prefix $options\n\n"; open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!"); my @lines = ; diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index a600a499e5..f13f1d38c4 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -503,6 +503,8 @@ CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken USE_HOSTCC = YES PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK +ASN1C = bin/asn1_compile + asn1_compile_OBJ_FILES = \ $(heimdalsrcdir)/lib/asn1/main.ho \ $(heimdalsrcdir)/lib/asn1/gen.ho \ -- cgit