fix convert46to50 for latest geoclaw

in particular files in Makefile were wrong due to recent geoclaw changes.