diff options
| author | Matthieu Patou <mat@matws.net> | 2011-02-20 13:23:48 +0300 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2011-02-21 09:47:05 +0100 |
| commit | e37db96d2ae1ffccaaa79cf4ebb5506386ae45ba (patch) | |
| tree | 3f58472a976627d5d1b31b0f09f27f337f637940 /source4 | |
| parent | 175227bc7195931a264bca17e4993d982480294d (diff) | |
| download | samba-e37db96d2ae1ffccaaa79cf4ebb5506386ae45ba.tar.gz samba-e37db96d2ae1ffccaaa79cf4ebb5506386ae45ba.tar.bz2 samba-e37db96d2ae1ffccaaa79cf4ebb5506386ae45ba.zip | |
s4: avoid overwritting the dceprc.h file from toplevel librpc
Change back to what was the configuration of header_path before
177ddcb084e8f8608bf2012a7c58f7b1e56d2acd so that dcerpc.h is installed
in ${prefix}/include and not in ${prefix}/include/gen_ndr as the
toplevel librpc wants also to put a dcerpc.h file in this directory.
Add some documentation in order to avoid any new regression.
This change should fix problems for openchange team.
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Mon Feb 21 09:47:05 CET 2011 on sn-devel-104
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/librpc/wscript_build | 9 |
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' ) |