On 01/ 3/13 10:40 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
> ---
> Makefile.am |3 +++
> proxymngr.man |2 +-
> 2 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 80f149d..4877985 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -59,6 +59,9 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
> EXTRA_DIST += $(appman_PRE)
> CLEANFILES += $(appman_DATA)
>
> +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via
> configure
> +MAN_SUBSTS += -e 's|__configdir__|$(CONFIG_DIR)|g'
> +
> SUFFIXES = .$(APP_MAN_SUFFIX) .man
>
> # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via
> configure
> diff --git a/proxymngr.man b/proxymngr.man
> index 0bb1ea5..f5d35bb 100644
> --- a/proxymngr.man
> +++ b/proxymngr.man
> @@ -75,7 +75,7 @@ requests are received and proxies are started.
> The proxy manager maintains a local configuration file describing the proxy
> services available. This configuration file is installed
> in
> -.I __projectroot__/lib/X11/proxymngr/pmconfig
> +.I __configdir__
> during the installation
> of proxymngr. The location of the configuration file can be overwritten
> using
> the \fB\-config\fP command line option.
Reviewed-by: Alan Coopersmith
--
-Alan Coopersmith- alan.coopersm...@oracle.com
Oracle Solaris Engineering - http://blogs.oracle.com/alanc
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
