Make some changes for setup-makefiles.sh