diff --git a/src/compiler/GF/Compile.hs b/src/compiler/GF/Compile.hs index cd5c643b2..b8db1e1a9 100644 --- a/src/compiler/GF/Compile.hs +++ b/src/compiler/GF/Compile.hs @@ -124,7 +124,7 @@ compileModule opts1 env file = do exists <- ioeIO $ doesFileExist file1 if exists then return file1 - else ioeErr $ Bad (render (text "None of this files exist:" $$ nest 2 (text file $$ text file1))) + else ioeErr $ Bad (render (text "None of these files exists:" $$ nest 2 (text file $$ text file1))) else ioeErr $ Bad (render (text "File" <+> text file <+> text "does not exist.")) compileOne :: Options -> CompileEnv -> FullPath -> IOE CompileEnv diff --git a/src/compiler/GF/Infra/UseIO.hs b/src/compiler/GF/Infra/UseIO.hs index dec2269fd..756df0679 100644 --- a/src/compiler/GF/Infra/UseIO.hs +++ b/src/compiler/GF/Infra/UseIO.hs @@ -70,7 +70,8 @@ getLibraryDirectory opts = getGrammarPath :: FilePath -> IO [FilePath] getGrammarPath lib_dir = do - catch (fmap splitSearchPath $ getEnv gfGrammarPathVar) (\_ -> return [lib_dir "prelude"]) -- e.g. GF_GRAMMAR_PATH + catch (fmap splitSearchPath $ getEnv gfGrammarPathVar) + (\_ -> return [lib_dir "alltenses",lib_dir "prelude"]) -- e.g. GF_GRAMMAR_PATH -- | extends the search path with the -- 'gfLibraryPath' and 'gfGrammarPathVar'