diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-10 23:08:14 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-17 16:55:51 +0000 |
| commit | 9260461f4fcc78ed7d4ac9936508dcd57ed40e6b (patch) | |
| tree | 01eb87c39a3cf09401986fa5ad803e5307849091 /wsutil | |
| parent | 978f6b4e1a94c831fa90421b6127e14f6ec9de17 (diff) | |
plugins: Use minor version number for plugin install path
Wireshark patch releases (X.Y.Z) are binary compatible so reflect
that in the plugin installation path.
By installing to $pkglibdir/plugins/X.Y out-of-tree plugins don't
need to be reinstalled with every patch release.
Change-Id: I9d1728e6fb12bcb51d2a723af22c750cb7a966cf
Reviewed-on: https://code.wireshark.org/review/23497
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/plugins.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wsutil/plugins.c b/wsutil/plugins.c index f251966e31..98b78db0e5 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -341,7 +341,8 @@ scan_plugins(plugin_load_failure_mode mode) } else { - plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_plugin_dir(), VERSION); + plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%d.%d", + get_plugin_dir(), VERSION_MAJOR, VERSION_MINOR); plugins_scan_dir(plugin_dir_path, mode); g_free(plugin_dir_path); } @@ -356,7 +357,8 @@ scan_plugins(plugin_load_failure_mode mode) */ if (!started_with_special_privs()) { - plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_plugins_pers_dir(), VERSION); + plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%d.%d", + get_plugins_pers_dir(), VERSION_MAJOR, VERSION_MINOR); plugins_scan_dir(plugin_dir_path, mode); g_free(plugin_dir_path); } |