fixed makefile macros