After the cjre work, you need to set ALT_BASE_IMAGE_DIR to an empty directory. This variable should no longer be needed, unless you're building a release with patches. Some Makefile and sanity check work needs to be done for this.