Index: scripts/config.bat
===================================================================
diff -u -r07fcd16f9a6e678a95133127f207509d18045080 -re53e822ded434e64c531cd6504758d2b74b987a5
--- scripts/config.bat	(.../config.bat)	(revision 07fcd16f9a6e678a95133127f207509d18045080)
+++ scripts/config.bat	(.../config.bat)	(revision e53e822ded434e64c531cd6504758d2b74b987a5)
@@ -40,4 +40,12 @@
 	exit /b 1
 )
 
+SET SVNINDEXCMD=
+for %%X in (svnindex.cmd) do (set SVNINDEXCMD=%%~$PATH:X)
+if "%SVNINDEXCMD%" == "" set SVNINDEXCMD=%ProgramFiles%\Debugging Tools for Windows (x64)\srcsrv\svnindex.cmd
+if not exist "%SVNINDEXCMD%" (
+	echo svnindex.cmd not found in PATH environment variable nor in its default location. Please install Debugging tools for Windows.
+	exit /b 1
+)
+
 exit /b 0
Index: scripts/internal/embed_srcserver_info.bat
===================================================================
diff -u -r718a83fb4e17e7d6160fdbf11b154e2068278586 -re53e822ded434e64c531cd6504758d2b74b987a5
--- scripts/internal/embed_srcserver_info.bat	(.../embed_srcserver_info.bat)	(revision 718a83fb4e17e7d6160fdbf11b154e2068278586)
+++ scripts/internal/embed_srcserver_info.bat	(.../embed_srcserver_info.bat)	(revision e53e822ded434e64c531cd6504758d2b74b987a5)
@@ -19,7 +19,7 @@
 	goto error
 )
 
-SET _command=call svnindex.cmd /debug /source=%MainProjectDir%\src\ictranslate;%MainProjectDir%\src\libictranslate;%MainProjectDir%\src\libicpf;%MainProjectDir%\src /symbols=%MainProjectDir%\bin\release
+SET _command=call "%SVNINDEXCMD%" /debug /source=%MainProjectDir%\src\ictranslate;%MainProjectDir%\src\libictranslate;%MainProjectDir%\src\libicpf;%MainProjectDir%\src /symbols=%MainProjectDir%\bin\release
 !_command! >"%TmpDir%\command.log"
 if errorlevel 1 (
 	echo ERROR: Error encountered while embedding source server information. See the log below: