From: Andreas Schneider Date: Wed, 5 Sep 2012 15:37:19 +0000 (+0200) Subject: wafsamba: Add support for manpages in SAMBA_MODULE. X-Git-Tag: samba-4.0.0rc1~176 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18eb505b895efae8b723ff3ecddc7c528c34b391;p=thirdparty%2Fsamba.git wafsamba: Add support for manpages in SAMBA_MODULE. --- diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index f1e7affbefe..1fb12410246 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -404,6 +404,7 @@ def SAMBA_MODULE(bld, modname, source, subdir=None, enabled=True, pyembed=False, + manpages=None, allow_undefined_symbols=False ): '''define a Samba module.''' @@ -469,6 +470,7 @@ def SAMBA_MODULE(bld, modname, source, link_name=build_link_name, install_path="${MODULESDIR}/%s" % subsystem, pyembed=pyembed, + manpages=manpages, allow_undefined_symbols=allow_undefined_symbols ) diff --git a/docs-xml/manpages/idmap_ad.8.xml b/source3/winbindd/man/idmap_ad.8.xml similarity index 100% rename from docs-xml/manpages/idmap_ad.8.xml rename to source3/winbindd/man/idmap_ad.8.xml diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/source3/winbindd/man/idmap_autorid.8.xml similarity index 98% rename from docs-xml/manpages/idmap_autorid.8.xml rename to source3/winbindd/man/idmap_autorid.8.xml index 498ef68fb34..3b93861eee4 100644 --- a/docs-xml/manpages/idmap_autorid.8.xml +++ b/source3/winbindd/man/idmap_autorid.8.xml @@ -118,7 +118,7 @@ This example shows how to configure idmap_autorid as default for all domains with a potentially large amount of users plus a specific configuration for a trusted domain - that uses the SFU mapping scheme. Please note that idmap + that uses the SFU mapping scheme. Please note that idmap ranges and sfu ranges are not allowed to overlap. diff --git a/docs-xml/manpages/idmap_hash.8.xml b/source3/winbindd/man/idmap_hash.8.xml similarity index 100% rename from docs-xml/manpages/idmap_hash.8.xml rename to source3/winbindd/man/idmap_hash.8.xml diff --git a/docs-xml/manpages/idmap_ldap.8.xml b/source3/winbindd/man/idmap_ldap.8.xml similarity index 99% rename from docs-xml/manpages/idmap_ldap.8.xml rename to source3/winbindd/man/idmap_ldap.8.xml index 2c0fcfd17c6..e68f2782bf2 100644 --- a/docs-xml/manpages/idmap_ldap.8.xml +++ b/source3/winbindd/man/idmap_ldap.8.xml @@ -82,8 +82,8 @@ EXAMPLES - The following example shows how an ldap directory is used as the - default idmap backend. It also configures the idmap range and base + The following example shows how an ldap directory is used as the + default idmap backend. It also configures the idmap range and base directory suffix. The secret for the ldap_user_dn has to be set with "net idmap secret '*' password". diff --git a/docs-xml/manpages/idmap_nss.8.xml b/source3/winbindd/man/idmap_nss.8.xml similarity index 100% rename from docs-xml/manpages/idmap_nss.8.xml rename to source3/winbindd/man/idmap_nss.8.xml diff --git a/docs-xml/manpages/idmap_rid.8.xml b/source3/winbindd/man/idmap_rid.8.xml similarity index 100% rename from docs-xml/manpages/idmap_rid.8.xml rename to source3/winbindd/man/idmap_rid.8.xml diff --git a/docs-xml/manpages/idmap_tdb.8.xml b/source3/winbindd/man/idmap_tdb.8.xml similarity index 100% rename from docs-xml/manpages/idmap_tdb.8.xml rename to source3/winbindd/man/idmap_tdb.8.xml diff --git a/docs-xml/manpages/idmap_tdb2.8.xml b/source3/winbindd/man/idmap_tdb2.8.xml similarity index 100% rename from docs-xml/manpages/idmap_tdb2.8.xml rename to source3/winbindd/man/idmap_tdb2.8.xml