From 671b6b4dff42efeef8c1e1471576f06fdcff8f68 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Thu, 21 Feb 2008 15:56:09 +0000
Subject: For Windows get the default GF_LIB_PATH from the executable path

---
 src/GF.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/GF.hs')

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 [
-- 
cgit v1.2.3