Improve structure of Makefile variables and fix rockspec