diff options
| author | michal.orynicz <michal.orynicz@tieto.com> | 2015-04-21 11:08:19 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2015-04-21 12:49:48 +0000 |
| commit | 448e122ea5d26d3f74a1053fc83c49d9bedd5e1a (patch) | |
| tree | f1047aed73cc8b79fc2f22a4cb4447ea9e024e0d | |
| parent | 847e5179dcbfb4f36137cae98502749f254fbab2 (diff) | |
[Androiddump] Fix CMake install path for androiddump
Changed path from "share" to one based on plugns path
For example /usr/local/lib/wireshark/extcap
Change-Id: I8f4a9f274b1cec897ed45de9e05679ac3f230301
Reviewed-on: https://code.wireshark.org/review/8161
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8921365d7b..0c752f518f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -945,16 +945,17 @@ else() endif() set (DATAFILE_DIR ${_datafile_dir} CACHE INTERNAL "Build time data file location.") -if(ENABLE_EXTCAP) - set(HAVE_EXTCAP 1) - set(EXTCAP_DIR "${DATAFILE_DIR}/extcap/") -endif() - if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}") else() set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") endif() + +if(ENABLE_EXTCAP) + set(HAVE_EXTCAP 1) + set(EXTCAP_DIR "${ABSOLUTE_CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/extcap/") +endif() + # Location of our plugins. PLUGIN_DIRECTORY should allow running # from the build directory similar to DATAFILE_DIR above. if(ENABLE_PLUGINS) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 8b7e99e605..e90f512449 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -23,7 +23,7 @@ #cmakedefine HAVE_SSE4_2 1 /* Directory where extcap hooks reside */ -#define EXTCAP_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/extcap/" +#define EXTCAP_DIR "${EXTCAP_DIR}" /* Define to 1 if we want to enable extcap */ #cmakedefine HAVE_EXTCAP 1 |