[PATCH] Change smb.conf.5 build to use XML entities to get always-correct default paths

[Jelmer Vernooij]

On Thu, Jan 30, 2014 at 09:09:00AM +1300, Andrew Bartlett wrote:
> diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
> index 68b2abe..e612a6e 100755
> --- a/docs-xml/smbdotconf/generate-file-list.sh
> +++ b/docs-xml/smbdotconf/generate-file-list.sh
> @@ -1,4 +1,20 @@
>  #!/bin/sh
> +#
> +# This is the fallback table for when we use the docs-xml build
> +# system.  When build as part of the main waf build, these are set to
> +# the full correct path for the system.
> +#
> +echo "<!DOCTYPE section [
> +<!ENTITY dynconfig.SCRIPTSBINDIR       '\${prefix}/sbin'>
> +<!ENTITY dynconfig.LOCKDIR             '\${prefix}/var/lock'>
> +<!ENTITY dynconfig.NCALRPCDIR          '\${prefix}/var/run/ncalrpc'>
> +<!ENTITY dynconfig.PIDDIR              '\${prefix}/var/run'>
> +<!ENTITY dynconfig.STATEDIR            '\${prefix}/var/locks'>
> +<!ENTITY dynconfig.PRIVATE_DIR         '\${prefix}/private'>
> +<!ENTITY dynconfig.SMB_PASSWD_FILE     '\${prefix}/private/smbpasswd'>
> +<!ENTITY dynconfig.WINBINDD_SOCKET_DIR '\${prefix}/var/run/ncalrpc'>
> +]>"
W00t! This is neat.

dynconfig is a confusing name here, as there is nothing dynamic about these paths anymore.

Cheers,

Jelmer