summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2006-11-06 14:56:07 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2006-11-06 14:56:07 -0800
commitad23a55a581ab18c4614e2cb5d82c4376ee88722 (patch)
tree24b81ded1fd36c2f79364bd798831285399e6129
parentc50afd78af7496938a10b317c5e41b4d99d1fc60 (diff)
Stop hardcoding /usr/X11R6/bin in manpage examples
-rw-r--r--Makefile.am1
-rw-r--r--xinit.man4
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index ca72604..1be6bb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,6 +64,7 @@ MANDEFS = \
-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
-D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \
-D__xinitdir__=$(XINITDIR) \
+ -D__bindir__=$(bindir) \
-DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
diff --git a/xinit.man b/xinit.man
index 1afc436..e560aa0 100644
--- a/xinit.man
+++ b/xinit.man
@@ -112,7 +112,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/X11R6/bin/Xqdss :1"
+.B "xinit \-\^\- /usr/local/bin/Xqdss :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"
@@ -164,7 +164,7 @@ novice users:
.in +8
.nf
\&#!/bin/sh
-xinit /usr/local/lib/site.xinitrc \-\^\- /usr/X11R6/bin/X -br
+xinit /usr/local/lib/site.xinitrc \-\^\- __bindir__/X -br
.fi
.in -8
.sp