Hello Bálint,
On Fri, 17 Mar 2017 09:39:58 +0100
Bálint Réczey <bal...@balintreczey.hu> wrote:
> Control: severity -1 minor
> Control: tags -1 confirmed
>
> Hi Alexander,
>
>
> Thanks for the bug report. Luckily /usr/lib/x86_64-linux-gnu is
> already on the path thus this buggy path does not make any harm.
Nope, it does not harm WS build, but makes impossible to build plugins
without hacks.
e.g. I use something like this:
set(WS_CMAKE_PATH "${WIRESHARK_LIBDIR}/wireshark")
LIST(APPEND CMAKE_MODULE_PATH "${WS_CMAKE_PATH}")
include( FindGLIB2 )
include(FindWireshark)
include_directories (${Wireshark_INCLUDE_DIR})
include( UseMakeDissectorReg )
And so on. You see, I use exact paths from pkg-config and cmake here.
> I will fix this after the freeze is over.
I attached the patch, I tested in my environment.
--
Best regards,
Alexander Gerasiov
Contacts:
e-mail: g...@cs.msu.su Homepage: http://gerasiov.net Skype: gerasiov
PGP fingerprint: 04B5 9D90 DF7C C2AB CD49 BAEA CA87 E9E8 2AAC 33F1
Description: Fix lubdir location in pkg-config and cmake files.
Author: Alexander Gerasiov <g...@debian.org>
Bug-Debian: https://bugs.debian.org/857729
Last-Update: 2017-03-27
--- wireshark-2.2.5+g440fd4d.orig/CMakeLists.txt
+++ wireshark-2.2.5+g440fd4d/CMakeLists.txt
@@ -1193,7 +1193,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake
set( prefix "${CMAKE_INSTALL_PREFIX}" )
set( exec_prefix "\${prefix}" )
-set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" )
+set( libdir "${CMAKE_INSTALL_LIBDIR}" )
set( includedir "\${prefix}/include" )
set( plugindir "\${libdir}/wireshark/plugins/${CPACK_PACKAGE_VERSION}" )
--- wireshark-2.2.5+g440fd4d.orig/cmake/modules/WiresharkConfig.cmake.in
+++ wireshark-2.2.5+g440fd4d/cmake/modules/WiresharkConfig.cmake.in
@@ -7,7 +7,7 @@ set(Wireshark_VERSION_STRING "@PROJECT_M
set(Wireshark_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
set(Wireshark_PLUGIN_INSTALL_DIR "@PLUGIN_INSTALL_DIR@")
-set(Wireshark_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@")
+set(Wireshark_LIB_DIR "@CMAKE_INSTALL_LIBDIR@")
set(Wireshark_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/wireshark")
set(Wireshark_CMAKE_MODULES_DIR "@CMAKE_INSTALL_MODULES_DIR@")
