Refactor Makefile to fix passing options to koji builds

Signed-off-by: Clark Williams <williams@redhat.com>