fixes to Makefile to support other distros

Additional needed fixes