Changes were lost in Makefiles on the branch -> trunk merge with svn... this...

Changes were lost in Makefiles on the branch -> trunk merge with svn... this re-applies those changes

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@1476 41f8697f-d340-4b68-9986-7bafba869bb8