Corrections to merged Makefile. gss-server and client both work with the resulting...