Updates to makefiles and RPM packaging