[Q21.4] Fixes to xemacs.mak