diff options
| author | João Valverde <j@v6e.pt> | 2019-10-10 15:34:46 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-10-10 15:58:41 +0000 |
| commit | 97cb389a3531269b3c86555156a2bba62ccfd8a5 (patch) | |
| tree | 16a7b35a0e1a1411fcf11ff3e05af31b2e2c57ae /wsutil/filesystem.c | |
| parent | 51fbc7198ef3ebd49c3c491e4a5b3ed72eec278d (diff) | |
Revert "CMake: Don't install HTML manuals twice"
This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993.
NSIS package is broken with this commit.
Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
Reviewed-on: https://code.wireshark.org/review/34758
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil/filesystem.c')
| -rw-r--r-- | wsutil/filesystem.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 97ec8a7ef7..3526ac1fbb 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -57,7 +57,6 @@ char *persconffile_dir = NULL; char *datafile_dir = NULL; char *persdatafile_dir = NULL; char *persconfprofile = NULL; -char *docfile_dir = NULL; static gboolean do_store_persconffiles = FALSE; static GHashTable *profile_files = NULL; @@ -1884,32 +1883,6 @@ get_datafile_path(const char *filename) } } -static void init_docfile_dir(void) -{ - if (running_in_build_directory_flag) { - docfile_dir = g_build_filename(get_progfile_dir(), "doc", NULL); - return; - } -#ifdef _WIN32 - docfile_dir = g_strdup(get_progfile_dir()); -#else -#ifdef __APPLE__ - if (appbundle_dir != NULL) { - docfile_dir = g_build_filename(appbundle_dir, "Contents/Resources/share/doc/wireshark", (gchar *)NULL); - return; - } -#endif - docfile_dir = g_strdup(DOC_DIR); -#endif -} - -const char *get_docfile_dir(void) -{ - if (!docfile_dir) - init_docfile_dir(); - return docfile_dir; -} - /* * Return an error message for UNIX-style errno indications on open or * create operations. @@ -2288,7 +2261,7 @@ done: } gchar * -help_file_url(const gchar *filename) +data_file_url(const gchar *filename) { gchar *file_path; gchar *uri; @@ -2297,7 +2270,7 @@ help_file_url(const gchar *filename) if(g_path_is_absolute(filename)) { file_path = g_strdup(filename); } else { - file_path = g_build_filename(get_docfile_dir(), filename, NULL); + file_path = g_strdup_printf("%s/%s", get_datafile_dir(), filename); } /* XXX - check, if the file is really existing, otherwise display a simple_dialog about the problem */ @@ -2333,8 +2306,6 @@ free_progdirs(void) #endif g_free(extcap_dir); extcap_dir = NULL; - g_free(docfile_dir); - docfile_dir = NULL; } /* |