[ros-diffs] [sedwards] 19158: fix a few more makefiles