summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/librpc/wscript_build9
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index afb89fde04..3d98c1adb3 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -157,7 +157,14 @@ bld.SAMBA_LIBRARY('dcerpc',
autoproto='rpc/dcerpc_proto.h',
public_deps='credentials tevent talloc',
public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h',
- header_path='gen_ndr',
+ # It's very important to keep this form of construction
+ # it force the sambawaf extension to put everything that match the first element
+ # (*gen_ndr*) into the dir named by the second element (gen_ndr).
+ # If we just put header_path = 'gen_ndr' then all the public_headers will go
+ # in 'gen_ndr' and for dcerpc.h (at least) it will cause a problem as
+ # we have already a dcerpc.h installed by librpc/wscript_build
+ # and one will overright the other which is not what we expect.
+ header_path=[ ('*gen_ndr*', 'gen_ndr') ],
vnum='0.0.1'
)