diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2008-11-29 15:49:44 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2008-11-29 15:49:44 +0100 |
| commit | ff4239346d12b4225bae722349f48377bfad4280 (patch) | |
| tree | 1a3d0f9765e2a1a2e6d54b024651907646ee1571 /xinitrc.cpp | |
| parent | 3c6b3e07e9e25d27fc45c9159bb77b32d6392e9f (diff) | |
| parent | f16336ce629fcab4366cd036b4c92e96f16ee37c (diff) | |
Merge branch 'obsd' of ssh://xenocara.org/git/xenocara/app/xinit into obsd
Conflicts:
configure.ac
xinit.c
xinitrc.cpp
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index 737bfab..d446f3c 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -1,6 +1,6 @@ XCOMM!SHELL_CMD XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ -XCOMM $OpenBSD: xinitrc.cpp,v 1.2 2006/11/26 17:17:57 matthieu Exp $ +XCOMM $OpenBSD: xinitrc.cpp,v 1.3 2008/04/20 13:46:02 matthieu Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -10,7 +10,15 @@ sysmodmap=XINITDIR/.Xmodmap XCOMM merge in defaults and keymaps if [ -f $sysresources ]; then +#ifdef __APPLE__ + if [ -x /usr/bin/cpp ] ; then + XRDB -merge $sysresources + else + XRDB -nocpp -merge $sysresources + fi +#else XRDB -merge $sysresources +#endif fi if [ -f $sysmodmap ]; then |