[OS-BUILD PATCH 0/4] redhat/Makefile: fix and clean up some of the logic (v2)