final automake-related fixes