diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2019-09-27 23:03:13 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-10-09 13:24:58 +0000 |
| commit | f1285fcf061669702ca1accd7b2c50ebc8198993 (patch) | |
| tree | e4e0e83535f5de15388d4af4e80841b28ef99a89 /extcap | |
| parent | 931a80492da92fe29fab6ac41eb219a6ca6b53d7 (diff) | |
| download | wireshark-f1285fcf061669702ca1accd7b2c50ebc8198993.tar.gz wireshark-f1285fcf061669702ca1accd7b2c50ebc8198993.tar.bz2 wireshark-f1285fcf061669702ca1accd7b2c50ebc8198993.zip | |
CMake: Don't install HTML manuals twice
HTML docs are installed to both $docdir and $pkgdatadir. Fix that
to install to $docdir only.
Change-Id: I115158585b6df9170d9a01249adbc8548df91f14
Reviewed-on: https://code.wireshark.org/review/34640
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 2 | ||||
| -rw-r--r-- | extcap/ciscodump.c | 2 | ||||
| -rw-r--r-- | extcap/randpktdump.c | 2 | ||||
| -rw-r--r-- | extcap/sdjournal.c | 2 | ||||
| -rw-r--r-- | extcap/sshdump.c | 2 | ||||
| -rw-r--r-- | extcap/udpdump.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 3832da27b3..ba464b694e 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -2528,7 +2528,7 @@ int main(int argc, char *argv[]) { extcap_conf = g_new0(extcap_parameters, 1); - help_url = data_file_url("androiddump.html"); + help_url = help_file_url("androiddump.html"); extcap_base_set_util_info(extcap_conf, argv[0], ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE, help_url); g_free(help_url); diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c index 681d1e1a5d..88148b6595 100644 --- a/extcap/ciscodump.c +++ b/extcap/ciscodump.c @@ -547,7 +547,7 @@ int main(int argc, char *argv[]) g_free(err_msg); } - help_url = data_file_url("ciscodump.html"); + help_url = help_file_url("ciscodump.html"); extcap_base_set_util_info(extcap_conf, argv[0], CISCODUMP_VERSION_MAJOR, CISCODUMP_VERSION_MINOR, CISCODUMP_VERSION_RELEASE, help_url); g_free(help_url); diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c index 659e829be9..e489053a6e 100644 --- a/extcap/randpktdump.c +++ b/extcap/randpktdump.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) g_free(err_msg); } - help_url = data_file_url("randpktdump.html"); + help_url = help_file_url("randpktdump.html"); extcap_base_set_util_info(extcap_conf, argv[0], RANDPKTDUMP_VERSION_MAJOR, RANDPKTDUMP_VERSION_MINOR, RANDPKTDUMP_VERSION_RELEASE, help_url); g_free(help_url); diff --git a/extcap/sdjournal.c b/extcap/sdjournal.c index b2a2d5d9e5..357078c06c 100644 --- a/extcap/sdjournal.c +++ b/extcap/sdjournal.c @@ -355,7 +355,7 @@ int main(int argc, char **argv) g_free(init_progfile_dir_error); } - help_url = data_file_url("sdjournal.html"); + help_url = help_file_url("sdjournal.html"); extcap_base_set_util_info(extcap_conf, argv[0], SDJOURNAL_VERSION_MAJOR, SDJOURNAL_VERSION_MINOR, SDJOURNAL_VERSION_RELEASE, help_url); g_free(help_url); diff --git a/extcap/sshdump.c b/extcap/sshdump.c index 84326c1ee2..70ceb0f27d 100644 --- a/extcap/sshdump.c +++ b/extcap/sshdump.c @@ -369,7 +369,7 @@ int main(int argc, char *argv[]) g_free(err_msg); } - help_url = data_file_url("sshdump.html"); + help_url = help_file_url("sshdump.html"); extcap_base_set_util_info(extcap_conf, argv[0], SSHDUMP_VERSION_MAJOR, SSHDUMP_VERSION_MINOR, SSHDUMP_VERSION_RELEASE, help_url); g_free(help_url); diff --git a/extcap/udpdump.c b/extcap/udpdump.c index bfc725f1f2..aa0812541e 100644 --- a/extcap/udpdump.c +++ b/extcap/udpdump.c @@ -380,7 +380,7 @@ int main(int argc, char *argv[]) g_free(err_msg); } - help_url = data_file_url("udpdump.html"); + help_url = help_file_url("udpdump.html"); extcap_base_set_util_info(extcap_conf, argv[0], UDPDUMP_VERSION_MAJOR, UDPDUMP_VERSION_MINOR, UDPDUMP_VERSION_RELEASE, help_url); g_free(help_url); |