Fixes for geodata generating Makefile.am

Pushed before testing