Cleaned up Makefile for consistency between packages. Remove outdated patch. Refreshed other one. Signed-off-by: Rosen Penev <rosenp@gmail.com>