osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Set PLUGIN_INSTALL_DIR properly for wireshark.pc 

Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747
Reviewed-on: https://code.wireshark.org/review/1861
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Balint Reczey 2014-05-29 00:32:20 +07:00 committed by Alexis La Goutte
parent aff380770a
commit 7bf49b31ac
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -688,8 +688,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
if(ENABLE_PLUGINS) if(ENABLE_PLUGINS)
set(HAVE_PLUGINS 1) set(HAVE_PLUGINS 1)
set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}") set(PLUGIN_DIR "${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
set(PLUGIN_INSTALL_DIR="${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}") set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}")
set(PLUGIN_SRC_DIRS set(PLUGIN_SRC_DIRS
plugins/docsis plugins/docsis
plugins/ethercat plugins/ethercat

5
cmakeconfig.h.in
View File

@ -18,9 +18,6 @@
/* Path to Python. */ /* Path to Python. */
#cmakedefine PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION}" #cmakedefine PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION}"
/* Directory where plugins reside */
#define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}"
/* Define to 1 if we want to enable plugins */ /* Define to 1 if we want to enable plugins */
#cmakedefine HAVE_PLUGINS 1 #cmakedefine HAVE_PLUGINS 1
@ -349,7 +346,7 @@
#cmakedefine PCAP_NG_DEFAULT 1 #cmakedefine PCAP_NG_DEFAULT 1
/* Plugin installation directory */ /* Plugin installation directory */
#cmakedefine PLUGIN_DIR #cmakedefine PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
/* Define if we are using version of of the Portaudio library API */ /* Define if we are using version of of the Portaudio library API */
#cmakedefine PORTAUDIO_API_1 1 #cmakedefine PORTAUDIO_API_1 1

2
configure.ac
View File

@ -2680,7 +2680,7 @@ then
AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled])
fi fi
AC_SUBST(plugindir) AC_SUBST(plugindir)
CPPFLAGS="$CPPFLAGS '-DPLUGIN_DIR=\"\$(plugindir)\"'" CPPFLAGS="$CPPFLAGS '-DPLUGIN_INSTALL_DIR=\"\$(plugindir)\"'"
# #
# The plugin dissectors reside in ./plugins/PROTO/ # The plugin dissectors reside in ./plugins/PROTO/

4
wsutil/filesystem.c
View File

@ -1069,7 +1069,7 @@ get_wspython_dir(void)
* *
* On Windows, we use the "plugin" subdirectory of the datafile directory. * On Windows, we use the "plugin" subdirectory of the datafile directory.
* *
* On UN*X, we use the PLUGIN_DIR value supplied by the configure * On UN*X, we use the PLUGIN_INSTALL_DIR value supplied by the configure
* script, unless we think we're being run from the build directory, * script, unless we think we're being run from the build directory,
* in which case we use the "plugin" subdirectory of the datafile directory. * in which case we use the "plugin" subdirectory of the datafile directory.
* *
@ -1153,7 +1153,7 @@ init_plugin_dir(void)
} }
#endif #endif
else { else {
plugin_dir = PLUGIN_DIR; plugin_dir = PLUGIN_INSTALL_DIR;
} }
} }
#endif #endif