diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-01-13 16:03:03 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-01-13 16:03:03 +0100 |
| commit | cd11ab120b65ec201fa1b09a1186118ca546026e (patch) | |
| tree | c1c3f30f1099cd5b9ee9a1ae9c7f53076ee521ac | |
| parent | 563a08a8f89261810a0b10f906ece91cd8a3c487 (diff) | |
| parent | 4e85bce64acef1fa0ddff04d59737444e942ff12 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Conflicts:
configure.ac
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | man/Makefile.am | 4 | ||||
| -rw-r--r-- | man/xinit.man | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0478a91..680cdc5 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ DEFAULT_XTERM=xterm DEFAULT_XSERVER=${bindir}/X DEFAULT_XAUTH=xauth DEFAULT_XINIT=xinit -DEFAULT_XINITDIR=${libdir}/X11/xinit +DEFAULT_XINITDIR=${sysconfdir}/X11/xinit DEFAULT_WM=fvwm DEFAULT_XCONSOLE=xconsole 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 |