[OS-BUILD PATCH 24/24] redhat/Makefile: Reorganize variables