summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@freedesktop.org>2011-05-19 09:29:10 +0200
committerEgbert Eich <eich@freedesktop.org>2013-01-04 05:39:55 -0500
commit4e07066c12f2e2ef69ec4e56f702452c1216c035 (patch)
treec83f307d8619c54c3ef094ae3e8f65dc7a6eeb1f
parenta636334182348da3b3f62012c1ae7690339ec620 (diff)
man: Set correct config file location in man page
Change the config file location from a hard coded path to what is set during build. Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Makefile.am3
-rw-r--r--proxymngr.man2
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.