Additional changes for supporting an install_dir.