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