GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

bug fix in import reading (had forgotten gfr)

Browse Source
This commit is contained in:
aarne
2007-09-12 07:53:54 +00:00
parent 1d40350b6e
commit 902b1f3afc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GF/Infra/ReadFiles.hs
View File

@@ -220,8 +220,12 @@ getImports ps = get [] where
tryRead name = do tryRead name = do
file <- do file <- do
let file_gf = gfFile name let file_gf = gfFile name
b <- doesFileExistPath ps file_gf -- try gf file first b <- doesFileExistPath ps file_gf -- try gf file first
if b then return file_gf else return (gfcFile name) -- gfc next if b then return file_gf else do
let file_gfr = gfrFile name
bb <- doesFileExistPath ps file_gfr -- gfr file next
if bb then return file_gfr else do
return (gfcFile name) -- gfc next
readFileIfPath ps $ file readFileIfPath ps $ file

2
src/Makefile
View File

@@ -62,7 +62,7 @@ endif
.PHONY: all unix jar tags gfdoc windows install install-gf \ .PHONY: all unix jar tags gfdoc windows install install-gf \
lib temp install-gfdoc install-editor \ lib temp install-gfdoc install-editor \
today help clean windows-msi today help clean windows-msi dist
all: unix gfdoc $(BUILD_JAR) all: unix gfdoc $(BUILD_JAR)