diff options
| author | Jeremy Huddleston <jeremy@tifa.local> | 2008-02-09 22:17:02 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@tifa.local> | 2008-02-09 22:17:02 -0800 |
| commit | 238b74a47eb66bfa24627b099bf9c6a06e91d35a (patch) | |
| tree | 6db5f08ccae69005911aaa7130cced1c31f8915a | |
| parent | b9a2f211eff9f7fdc1399146d175923ca589cf2a (diff) | |
Apple: use -nocpp arg to xrdb if cpp is not installed
| -rw-r--r-- | xinitrc.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index e01b9e7..c44e0fd 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -9,7 +9,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 @@ -17,7 +25,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 |