Some of the latest changes to Makefile.am files are missing. This patch restores the LOCALEDIR variable, among others, and dispenses with the include directives in the ps/ and top/ subdirectories since they're no longer needed.
Conflicts: configure.ac pmap.c ps/Makefile.am
Reviewed-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Jim Warner <james.warner@comcast.net>