Update to match what the configure script produces. Just for uniformity,