From 9147e196111b28bddf8994df199a9992a24aa5f2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 16 Oct 2010 17:26:24 +0200 Subject: heimdal: Allow leaving off prefix from asn1 option_file. --- source4/heimdal_build/wscript_build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index aa952e7786c..6a735ff4659 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -23,6 +23,9 @@ def HEIMDAL_ASN1(name, source, dname = os.path.dirname(source) asn1name = "%s_asn1" % bname + if option_file: + option_file = heimdal_path(option_file) + if not SET_TARGET_TYPE(bld, name, 'ASN1'): return @@ -340,7 +343,7 @@ HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1', HEIMDAL_ASN1('HEIMDAL_KRB5_ASN1', 'lib/asn1/krb5.asn1', - option_file='../heimdal/lib/asn1/krb5.opt', + option_file='lib/asn1/krb5.opt', directory='lib/asn1' ) @@ -699,7 +702,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_HX509"): HEIMDAL_ASN1('HEIMDAL_CMS_ASN1', 'lib/asn1/cms.asn1', - option_file='../heimdal/lib/asn1/cms.opt', + option_file='lib/asn1/cms.opt', directory='lib/asn1' ) -- cgit