3 files changed, 11 insertions, 5 deletions
diff --git a/app/xinit/man/Makefile.am b/app/xinit/man/Makefile.am
index 074bc3619..b24faca6b 100644
--- a/app/xinit/man/Makefile.am
+++ b/app/xinit/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/app/xinit/man/Makefile.in b/app/xinit/man/Makefile.in
index 568da4b3d..33038e51c 100644
--- a/app/xinit/man/Makefile.in
+++ b/app/xinit/man/Makefile.in
@@ -160,12 +160,14 @@ MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' -e \
 	's|__XCONFIGFILE__|$(XCONFIGFILE)|g' -e \
 	's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' -e \
 	's|__xinitdir__|$(XINITDIR)|g' -e 's|__bindir__|$(bindir)|g' \
-	-e 's|__libdir__|$(libdir)|g' -e 's|__SCOMAN__|$(SCOMAN)|g'
+	-e 's|__libdir__|$(libdir)|g' -e 's|__SCOMAN__|$(SCOMAN)|g' -e \
+	's|__configdir__|$(XINITDIR)|g'
 MCOOKIE = @MCOOKIE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
+OPENSSL = @OPENSSL@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -175,6 +177,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SCOMAN = @SCOMAN@
diff --git a/app/xinit/man/xinit.man b/app/xinit/man/xinit.man
index 31b93aab5..f8005ce40 100644
--- a/app/xinit/man/xinit.man
+++ b/app/xinit/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