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 /configure.ac | |
| parent | 563a08a8f89261810a0b10f906ece91cd8a3c487 (diff) | |
| parent | 4e85bce64acef1fa0ddff04d59737444e942ff12 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 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 |