diff --git a/Make.bat b/Make.bat
index 5cb9603e..2cf36947 100644
--- a/Make.bat
+++ b/Make.bat
@@ -29,11 +29,15 @@ goto Loop
 
 REM Try to determine install location
 if "%dest%"=="" (
-  REM TODO Separate paths with search path separator ; and pick first one
-  set dest=%GF_LIB_PATH%
+  REM Separate paths with search path separator ; and pick first one
+  for %%p in ("%GF_LIB_PATH:;=";"%") do (
+    set dest=%%~p
+    goto BreakLibPath
+  )
 )
+:BreakLibPath
 if "%dest%"=="" (
-  REM TODO Look in ../gf-core/DATA=DIR
+  REM TODO Look in ../gf-core/DATA_DIR
 )
 if "%dest%"=="" (
   echo Unable to determine where to install the RGL. Please do one of the following: