Fixed Makefile to so that only relevant parameters from config.makefile are updated