cleanup of makefile updating to make it work again and simplified the logic that actually alters the makefile, to use simple regular expressions instead of infofile parsing, to keep the structure of the makefile intact