Further modify Makefile routine