Update for upstream changes.

Also change from rlib/dylib to lib (dylib is not necessary and
complicates matters in this new rpath-free world).