branches: 1.5.2; 1.5.6;stop using XSERVERINCDIR since it was referencing src/x11 reachoverthis is not correct for xorg reachover