For Windows get the default GF_LIB_PATH from the executable path

1 files changed, 2 insertions, 4 deletions

diff --git a/src/GF.hs b/src/GF.hs
index 30c9ab5a2..006d5f0df 100644
--- a/src/GF.hs
+++ b/src/GF.hs
@@ -119,15 +119,13 @@ helpMsg = unlines [
   ]
 
 welcomeMsgLib = do
-  lib <- catch 
-    (getEnv "GF_LIB_PATH" >>= return . ("GF_LIB_PATH is set to" +++)) 
-    (const (return $ "GF_LIB_PATH is set to the default, " ++ libdir))
+  lib <- getLibraryPath
   return $ welcomeMsg lib
 
 welcomeMsg lib = 
   "Welcome to " ++ authorMsg ++++ 
   "If \228 and \246 (umlaut letters) look strange, see 'h -coding'." ++
-  "\n" ++ lib ++
+  "\nGF_LIB_PATH is set to " ++ lib ++
   "\n\nType 'h' for help, and 'h [Command] for more detailed help.\n"
 
 authorMsg = unlines [