Deal with machines having /usr/X11R7 but no (or broken) /usr/X11R6.