Added build-prefix support
Added support for variant_dir