Use base_name instead of basename - fixes Savannah bug 11003.