diff options
| author | aarne <unknown> | 2005-05-27 10:37:57 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-05-27 10:37:57 +0000 |
| commit | dc49b7a89190f58319e5986b822552486255b4e1 (patch) | |
| tree | a3cab0ff62df7c3a1215990a2a48ff5b050028cc /src | |
| parent | 276a08a0d7b4b53a382c471a92a1084f1718c34a (diff) | |
lib path and *
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/Compile.hs | 6 | ||||
| -rw-r--r-- | src/GF/Infra/UseIO.hs | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs index a95c11599..e2b835273 100644 --- a/src/GF/Compile/Compile.hs +++ b/src/GF/Compile/Compile.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/05/27 08:13:35 $ +-- > CVS $Date: 2005/05/27 11:37:57 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.38 $ +-- > CVS $Revision: 1.39 $ -- -- The top-level compilation chain from source file to gfc\/gfr. ----------------------------------------------------------------------------- @@ -135,7 +135,7 @@ compileEnvShSt st fs = ((0,sgr,cgr),fts) where fts = readFiles st pathListOpts :: Options -> FileName -> IO [InitPath] -pathListOpts opts file = maybe (return [file]) getFilePaths $ getOptVal opts pathList +pathListOpts opts file = return $ maybe [file] pFilePaths $ getOptVal opts pathList reverseModules (MGrammar ms) = MGrammar $ reverse ms diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs index 487ad1fba..67f0d6c1b 100644 --- a/src/GF/Infra/UseIO.hs +++ b/src/GF/Infra/UseIO.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/05/27 08:13:35 $ +-- > CVS $Date: 2005/05/27 11:37:57 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.15 $ +-- > CVS $Revision: 1.16 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -113,9 +113,9 @@ extendPathEnv :: String -> String -> [FilePath] -> IO [FilePath] extendPathEnv lib var ps = do b <- catch (getEnv lib) (const (return "")) -- e.g. GF_LIB_PATH s <- catch (getEnv var) (const (return "")) -- e.g. GF_GRAMMAR_PATH - fs <- getFilePaths s + let fs = pFilePaths s let ss = ps ++ fs - return $ ss ++ [b ++ "/" ++ s | s <- ss] + liftM concat $ mapM allSubdirs $ ss ++ [b ++ "/" ++ s | s <- ss] pFilePaths :: String -> [FilePath] pFilePaths s = case break isPathSep s of |