Update Debian build settings (again)
Update Makefile