Update Makefile to work in a similar fashion to main branch