diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
| commit | 694382bba9d1645547afc3ece9920e48f8767295 (patch) | |
| tree | 9fb4c3e7f198a764472b7fa95a2e2600320ff04b /src/lexer.l | |
| parent | 197a4e4d364fbdd0aca8fb9027476ee1c48652e3 (diff) | |
| parent | 329295f17fe1b3d2d6b218c762201214f431b70a (diff) | |
Merge branch 'master' into value
Conflicts:
src/parsersettings.cc
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lexer.l b/src/lexer.l index 188046f..f939330 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -118,7 +118,7 @@ use[ \t\r\n>]*"<" { BEGIN(cond_use); } else { usepath = sourcepath() / filename; if (!fs::exists(usepath)) { - usepath = boosty::absolute(fs::path(get_librarydir()) / filename); + usepath = locate_file(filename); } } /* Only accept regular files which exists */ @@ -214,7 +214,7 @@ void includefile() fs::path finfo = dirinfo / filename; if (!exists(finfo)) { - finfo = fs::path(get_librarydir()) / filepath / filename; + finfo = locate_file((fs::path(filepath) / filename).string()); } filepath.clear(); |