path: root/wsutil
diff options
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-09-22 19:13:33 +0100
committerJoão Valverde <j@v6e.pt>2017-09-23 17:49:08 +0000
commitfd4dc6f115868f18e787f4bffaf8f8c5ceccff82 (patch)
tree2d3227bf7637108fae61400b43f15041554808d4 /wsutil
parentcaa9b19107a097a64552e5fc071f4d7fd218b59e (diff)
plugins: Fixups for g9260461f4f
Put plugins in CMake build dir with a version subdir. This avoids some weird special cases, however running with autotools from build dir displays the wrong global folder in about->folders. Unfortunately the hack to run from the autotools build dir is troublesome. Various fixes for Windows builds. Try to fix also build dir issue loading plugins on macOS with ENABLE_APPLICATION_BUNDLE (blind). Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c Reviewed-on: https://code.wireshark.org/review/23657 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
1 files changed, 1 insertions, 1 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index ea4629091b..ce1eca773b 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -975,7 +975,7 @@ init_plugin_dir(void)
* on Windows, the data file directory is the directory
* in which the Wireshark binary resides.
- plugin_dir = g_build_filename(get_datafile_dir(), "plugins", VERSION, (gchar *)NULL);
+ plugin_dir = g_build_filename(get_datafile_dir(), "plugins", (gchar *)NULL);
* Make sure that pathname refers to a directory.