Fix the Info directory file entry and provide patches for both the .texi and the .info file so USE_MAKEINFO is not needed.