diff options
| author | Evan Nemerson <evan@coeus-group.com> | 2012-06-22 12:04:40 -0700 |
|---|---|---|
| committer | Evan Nemerson <evan@coeus-group.com> | 2012-06-22 12:04:40 -0700 |
| commit | 07d3bbf32e546b432eee11bd802999594fa733ef (patch) | |
| tree | 8054024b98dbeef05ea8be00819c5def4e850c64 /vala | |
| parent | 814b29b1a662efcd9e3990acdf1c04af05e05ced (diff) | |
| download | vala-07d3bbf32e546b432eee11bd802999594fa733ef.tar.gz | |
Give priority to unversioned vapi directory
This allows bindings distributed with upstream libraries to be
prioritized over bindings distributed with Vala.
Diffstat (limited to 'vala')
| -rw-r--r-- | vala/valacodecontext.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala index faa431b67..f2b8b5991 100644 --- a/vala/valacodecontext.vala +++ b/vala/valacodecontext.vala @@ -537,18 +537,18 @@ public class Vala.CodeContext { } } - if (versioned_data_dir != null) { + if (data_dir != null) { foreach (string dir in Environment.get_system_data_dirs ()) { - filename = Path.build_path ("/", dir, versioned_data_dir, basename); + filename = Path.build_path ("/", dir, data_dir, basename); if (FileUtils.test (filename, FileTest.EXISTS)) { return filename; } } } - if (data_dir != null) { + if (versioned_data_dir != null) { foreach (string dir in Environment.get_system_data_dirs ()) { - filename = Path.build_path ("/", dir, data_dir, basename); + filename = Path.build_path ("/", dir, versioned_data_dir, basename); if (FileUtils.test (filename, FileTest.EXISTS)) { return filename; } |