Log Message: geography/gpsd: Reapply Makefile commit This logically belongs with the update to 3.21, but the Makefile part ended up on the branch.