More makefile variable replacements