diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | wireshark.pc.in | 22 |
3 files changed, 19 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22cf880d48..43ab266cc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1158,6 +1158,12 @@ configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_BINARY_DIR}/version.h) #set_target_properties(${CMAKE_BINARY_DIR}/version.h PROPERTIES FOLDER "Auxiliary") +set( prefix "${CMAKE_INSTALL_PREFIX}" ) +set( exec_prefix "\${prefix}" ) +set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" ) +set( includedir "\${prefix}/include" ) +set( plugindir "\${libdir}/${PLUGIN_INSTALL_DIR}" ) + set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/") set( IN_FILES adns_dll.rc diff --git a/configure.ac b/configure.ac index 18dfb8665b..1bd920e74b 100644 --- a/configure.ac +++ b/configure.ac @@ -3043,7 +3043,7 @@ dnl check whether plugins should be enabled and, if they should be, dnl check for plugins directory - stolen from Amanda's configure.ac dnl dnl we don't wish to expand ${libdir} yet -plugindir='${libdir}/wireshark/plugins/${VERSION}' +plugindir="\${libdir}/wireshark/plugins/${VERSION}" AC_ARG_WITH(plugins, AC_HELP_STRING( [--with-plugins@<:@=DIR@:>@], [support plugins (installed in DIR, if supplied) @<:@default=yes, if possible@:>@]), @@ -3172,6 +3172,7 @@ AC_OUTPUT( Makefile doxygen.cfg asn1/Makefile + wireshark.pc _CUSTOM_ASN1_AC_OUTPUT_ asn1/acp133/Makefile asn1/acse/Makefile diff --git a/wireshark.pc.in b/wireshark.pc.in index 826b230577..588917812b 100644 --- a/wireshark.pc.in +++ b/wireshark.pc.in @@ -1,14 +1,14 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} -libdir=@ABSOLUTE_CMAKE_INSTALL_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ sharedlibdir=${libdir} -includedir=${prefix}/include/wireshark -plugindir=@PLUGIN_INSTALL_DIR@ +plugindir=@plugindir@ -Name: wireshark -Description: wireshark network packet dissection library -Version: @PROJECT_VERSION@ +Name: Wireshark +Description: Network Packet Dissection Library +Version: @VERSION@ -Requires: -Libs: -L${libdir} -L${sharedlibdir} -lwireshark -Cflags: -I${includedir} +Requires: glib-2.0, gmodule-2.0, gthread-2.0 +Libs: -L${libdir} -lwireshark +Cflags: -I${includedir}/wireshark |