Bug 835992 - format makefile variables