[cvs-nhc98] patch applied (york-compiler98): Fix so that makeRelativeToCurrentDirectory always comes from System.FilePath - in GHC 6.8 it comes from System.Directory as well