diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-02-13 11:08:19 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-02-13 23:55:10 +0000 |
| commit | aedf6fe1c5f735aa036bec9173f7fb656ce2c95b (patch) | |
| tree | 6ce88f0f2b58c5f49e5bf4912d18c2e193d7bbd3 /wsutil/filesystem.c | |
| parent | b3c5fcb67c89e0f9bcc4e38861f23d90792a0e7e (diff) | |
macOS: Fix our plugin path.
In CMake we only used PROJECT_RELEASE_VERSION to construct our plugin
path, so rename it to PLUGIN_PATH_ID. Use a dash to separate version
numbers on macOS in order to allow code signing and a period elsewhere.
In the C code we only used VERSION_RELEASE to construct our plugin path,
so rename it to PLUGIN_PATH_ID.
Change-Id: I02abc591d7857269e8d47b414b61df4b28a25f2d
Reviewed-on: https://code.wireshark.org/review/32013
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wsutil/filesystem.c')
| -rw-r--r-- | wsutil/filesystem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index ffb7fed70b..a107d5ca26 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -1002,7 +1002,7 @@ get_plugins_dir_with_version(void) if (!plugin_dir) init_plugin_dir(); if (plugin_dir && !plugin_dir_with_version) - plugin_dir_with_version = g_build_filename(plugin_dir, VERSION_RELEASE, (gchar *)NULL); + plugin_dir_with_version = g_build_filename(plugin_dir, PLUGIN_PATH_ID, (gchar *)NULL); return plugin_dir_with_version; } @@ -1021,7 +1021,7 @@ get_plugins_pers_dir_with_version(void) if (!plugin_pers_dir) init_plugin_pers_dir(); if (plugin_pers_dir && !plugin_pers_dir_with_version) - plugin_pers_dir_with_version = g_build_filename(plugin_pers_dir, VERSION_RELEASE, (gchar *)NULL); + plugin_pers_dir_with_version = g_build_filename(plugin_pers_dir, PLUGIN_PATH_ID, (gchar *)NULL); return plugin_pers_dir_with_version; } |