diff options
| -rw-r--r-- | packaging/nsis/custom_diameter_xmls.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/custom_plugins.txt | 2 | ||||
| -rw-r--r-- | wsutil/filesystem.c | 50 |
3 files changed, 4 insertions, 50 deletions
diff --git a/packaging/nsis/custom_diameter_xmls.txt b/packaging/nsis/custom_diameter_xmls.txt index d4c0c38a77..002cf17164 100644 --- a/packaging/nsis/custom_diameter_xmls.txt +++ b/packaging/nsis/custom_diameter_xmls.txt @@ -1,4 +1,4 @@ ; $Id$ ;Add your custom diameter dictionary here ; Example: -;File "..\..\diameter\foo.xml" +;File "${STAGING_DIR}\diameter\foo.xml" diff --git a/packaging/nsis/custom_plugins.txt b/packaging/nsis/custom_plugins.txt index d65d30ec46..cbc397390b 100644 --- a/packaging/nsis/custom_plugins.txt +++ b/packaging/nsis/custom_plugins.txt @@ -1,3 +1,3 @@ ;Add your custom plugins directives here ; Example: -;File "${STAGING_DIR}\plugins\${VERSION}\foo.dll" +;File "${STAGING_DIR}\plugins\foo.dll" diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 85bd7ebfd4..7b5eee83d8 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -979,30 +979,7 @@ init_plugin_dir(void) * on Windows, the data file directory is the directory * in which the Wireshark binary resides. */ - plugin_dir = g_strdup_printf("%s\\plugins\\%s", get_datafile_dir(), - VERSION); - - /* - * Make sure that pathname refers to a directory. - */ - if (test_for_directory(plugin_dir) != EISDIR) { - /* - * Either it doesn't refer to a directory or it - * refers to something that doesn't exist. - * - * Assume that means we're running a version of - * Wireshark we've built in a build directory, - * in which case {datafile dir}\plugins is the - * top-level plugins source directory, and use - * that directory and set the "we're running in - * a build directory" flag, so the plugin - * scanner will check all subdirectories of that - * directory for plugins. - */ - g_free( (gpointer) plugin_dir); - plugin_dir = g_strdup_printf("%s\\plugins", get_datafile_dir()); - running_in_build_directory_flag = TRUE; - } + plugin_dir = g_strdup_printf("%s\\plugins", get_datafile_dir()); #else if (running_in_build_directory_flag) { /* @@ -1088,30 +1065,7 @@ static void init_extcap_dir(void) { * on Windows, the data file directory is the directory * in which the Wireshark binary resides. */ - extcap_dir = g_strdup_printf("%s\\extcap\\%s", get_datafile_dir(), - VERSION); - - /* - * Make sure that pathname refers to a directory. - */ - if (test_for_directory(extcap_dir) != EISDIR) { - /* - * Either it doesn't refer to a directory or it - * refers to something that doesn't exist. - * - * Assume that means we're running a version of - * Wireshark we've built in a build directory, - * in which case {datafile dir}\plugins is the - * top-level extcap hooks source directory, and use - * that directory and set the "we're running in - * a build directory" flag, so the plugin - * scanner will check all subdirectories of that - * directory for extcap hooks. - */ - g_free( (gpointer) extcap_dir); - extcap_dir = g_strdup_printf("%s\\extcap", get_datafile_dir()); - running_in_build_directory_flag = TRUE; - } + extcap_dir = g_strdup_printf("%s\\extcap", get_datafile_dir()); #else if (running_in_build_directory_flag) { /* |