Merge branch 'master' into majestic

src/compiler/GF/Main.hs

@@ -44,7 +44,10 @@ getOptions = do
 mainOpts :: Options -> [FilePath] -> IO ()
 mainOpts opts files =
     case flag optMode opts of
-      ModeVersion     -> putStrLn $ "Grammatical Framework (GF) version " ++ showVersion version ++ "\n" ++ buildInfo
+      ModeVersion     -> do datadir <- getDataDir
+                            putStrLn $ "Grammatical Framework (GF) version " ++ showVersion version ++ "\n" ++ 
+                                       buildInfo ++ "\n" ++
+                                       "Shared folder: " ++ datadir
       ModeHelp        -> putStrLn helpMessage
       ModeServer port -> mainServerGFI opts port files
       ModeCompiler    -> mainGFC opts files

src/runtime/haskell/Setup.hs

@@ -0,0 +1,3 @@
+import Distribution.Simple
+
+main = defaultMain

src/server/Setup.hs

@@ -0,0 +1,4 @@
+import Distribution.Simple(defaultMain)
+
+main :: IO ()
+main = defaultMain