Merge "Use correct VG_LIBDIR even if out is empty"