Sync with recent make install changes, notably the requirement for a non-root