Improved makefile for package