Makefile tweaks for easier building

Make building packages easier as well as adds consistency with other Makefiles.