[OS-BUILD PATCHv7 0/3] redhat/Makefile: fix and clean up some of the logic