Fixed make file for new ways of making package