diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2020-06-18 21:54:46 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2020-06-18 21:54:46 +0000 |
| commit | f83c808732cc2d5a0f7bc82e5d656bc64242028a (patch) | |
| tree | 348d24524d60dc07d266bc6071744000ce2fb958 | |
| parent | ab0e79ac280f251c4e33b060d5508b911c28fa3b (diff) | |
| parent | b82e63d3f123207dfd0cc28b852355cd6b0059a4 (diff) | |
| download | tracker-f83c808732cc2d5a0f7bc82e5d656bc64242028a.tar.gz | |
Merge branch 'sam/versioned-name' into 'master'
build: Use `tracker3` as versioned name, not `tracker-3`
Closes #228
See merge request GNOME/tracker!271
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/libtracker-common/tracker-language.c | 2 | ||||
| -rw-r--r-- | src/libtracker-sparql/tracker-utils.c | 2 | ||||
| -rw-r--r-- | src/tracker/tracker-endpoint.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 8150c944f..de6e61be5 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ cc = meson.get_compiler('c') # This is the X.Y used in -llibtracker-FOO-X.Y tracker_api_version = '3.0' tracker_api_major = tracker_api_version.split('.')[0] -tracker_versioned_name = 'tracker-@0@'.format(tracker_api_major) +tracker_versioned_name = 'tracker@0@'.format(tracker_api_major) tracker_version = meson.project_version().split('-')[0] tracker_major_version = tracker_version.split('.')[0].to_int() diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c index d8bcbb5e8..dc51e0576 100644 --- a/src/libtracker-common/tracker-language.c +++ b/src/libtracker-common/tracker-language.c @@ -228,7 +228,7 @@ language_get_stopword_filename (const gchar *language_code) testpath = g_getenv ("TRACKER_LANGUAGE_STOP_WORDS_DIR"); if (!testpath) { filename = g_build_filename (SHAREDIR, - "tracker-3", + "tracker3", "stop-words", str, NULL); diff --git a/src/libtracker-sparql/tracker-utils.c b/src/libtracker-sparql/tracker-utils.c index a54b69d23..602a64b0b 100644 --- a/src/libtracker-sparql/tracker-utils.c +++ b/src/libtracker-sparql/tracker-utils.c @@ -89,5 +89,5 @@ tracker_sparql_get_uuid_urn (void) GFile * tracker_sparql_get_ontology_nepomuk (void) { - return g_file_new_for_path (SHAREDIR "/tracker-3/ontologies/nepomuk"); + return g_file_new_for_path (SHAREDIR "/tracker3/ontologies/nepomuk"); } diff --git a/src/tracker/tracker-endpoint.c b/src/tracker/tracker-endpoint.c index ae649f602..7fc157f7b 100644 --- a/src/tracker/tracker-endpoint.c +++ b/src/tracker/tracker-endpoint.c @@ -223,7 +223,7 @@ tracker_endpoint (int argc, const char **argv) if (ontology_path) { ontology = g_file_new_for_commandline_arg (ontology_path); } else if (ontology_name) { - gchar *path = g_build_filename (SHAREDIR, "tracker-3", "ontologies", ontology_name, NULL); + gchar *path = g_build_filename (SHAREDIR, "tracker3", "ontologies", ontology_name, NULL); ontology = g_file_new_for_path (path); g_free (path); } |