Makefile works now
Use correct vars and divide where we should