[PATCH xinit] man: Set correct config file location in man page

[Alan Coopersmith]

On 01/ 3/13 10:54 AM, Egbert Eich wrote:
> Change the config file location from a hard coded path to what is
> set during build.
> 
> Signed-off-by: Egbert Eich <eich at freedesktop.org>
> ---
>  man/Makefile.am |    4 +++-
>  man/xinit.man   |    6 +++---
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/man/Makefile.am b/man/Makefile.am
> index 074bc36..b24faca 100644
> --- a/man/Makefile.am
> +++ b/man/Makefile.am
> @@ -13,7 +13,9 @@ MAN_SUBSTS+=	-e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
>  		-e 's|__xinitdir__|$(XINITDIR)|g' \
>  		-e 's|__bindir__|$(bindir)|g' \
>  		-e 's|__libdir__|$(libdir)|g' \
> -		-e 's|__SCOMAN__|$(SCOMAN)|g'
> +		-e 's|__SCOMAN__|$(SCOMAN)|g' \
> +		-e 's|__configdir__|$(XINITDIR)|g'
> +
>  
>  # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
>  .man.$(APP_MAN_SUFFIX):
> diff --git a/man/xinit.man b/man/xinit.man
> index 31b93aa..f8005ce 100644
> --- a/man/xinit.man
> +++ b/man/xinit.man
> @@ -109,7 +109,7 @@ used.
>  This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP,
>  if it exists, or else start an \fIxterm\fP.
>  .TP 8
> -.B "xinit \-\^\- /usr/local/bin/Xvnc  :1"
> +.B "xinit \-\^\- __bindir__/Xvnc  :1"
>  This is how one could start a specific type of server on an alternate display.
>  .TP 8
>  .B "xinit \-geometry =80x65+10+10 \-fn 8x13 \-j \-fg white \-bg navy"
> @@ -149,7 +149,7 @@ a default \fI\.xinitrc\fP that references a site-wide startup file:
>  .in +8
>  .nf
>  \&#!/bin/sh
> -\&. /usr/local/lib/site.xinitrc
> +\&. __configdir__/site.xinitrc
>  .fi
>  .in -8
>  .sp
> @@ -161,7 +161,7 @@ novice users:
>  .in +8
>  .nf
>  \&#!/bin/sh
> -xinit /usr/local/lib/site.xinitrc \-\^\- __bindir__/X -br
> +xinit __configdir__/site.xinitrc \-\^\- __bindir__/X -br
>  .fi
>  .in -8
>  .sp

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc