diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2008-04-20 16:28:56 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@reactor.herrb.net> | 2008-04-20 16:28:56 +0200 |
| commit | f16336ce629fcab4366cd036b4c92e96f16ee37c (patch) | |
| tree | 9ca01e7b0e14ca703fa69695d4f2d6ba14b447b0 /xinitrc.cpp | |
| parent | f24144641b2bad8e1aef1ae68502c19633e3d612 (diff) | |
Merge xinit 1.0.8
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index 6c10073..d9be5cb 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 @@ -18,7 +26,15 @@ if [ -f $sysmodmap ]; then fi if [ -f $userresources ]; then +#ifdef __APPLE__ + if [ -x /usr/bin/cpp ] ; then + XRDB -merge $userresources + else + XRDB -nocpp -merge $userresources + fi +#else XRDB -merge $userresources +#endif fi if [ -f $usermodmap ]; then |