gplugin/gplugin

I think this is it for the problems that GNUInstallDirs exposed
develop
2015-05-19, Gary Kramlich
f4372bf1c955
Parents 767babc445c0
Children 0c94a1c16af1
I think this is it for the problems that GNUInstallDirs exposed
3 files changed, 5 insertions(+), 4 deletions(-)
  • +1 -0
    CMakeLists.txt
  • +3 -3
    gplugin/gplugin-manager.c
  • +1 -1
    gplugin/gplugin.pc.in
    • --- a/CMakeLists.txt Tue May 19 00:22:26 2015 -0500
    +++ b/CMakeLists.txt Tue May 19 00:25:51 2015 -0500
    @@ -151,6 +151,7 @@
    -std=c99
    -g -g3
    -DPREFIX="${CMAKE_INSTALL_PREFIX}"
    + -DLIBDIR="${CMAKE_INSTALL_LIBDIR}"
    -DGPLUGIN_WEBSITE="http://bitbucket.org/gplugin/main"
    -Wall
    -Werror=format-security
    --- a/gplugin/gplugin-manager.c Tue May 19 00:22:26 2015 -0500
    +++ b/gplugin/gplugin-manager.c Tue May 19 00:25:51 2015 -0500
    @@ -1119,7 +1119,7 @@
    gplugin_manager_add_default_paths(void) {
    gchar *path;
    - path = g_build_filename(PREFIX, "lib", "gplugin", NULL);
    + path = g_build_filename(PREFIX, LIBDIR, "gplugin", NULL);
    gplugin_manager_prepend_path(path);
    g_free(path);
    @@ -1140,13 +1140,13 @@
    */
    void
    gplugin_manager_add_app_paths(const gchar *prefix,
    - const gchar *appname)
    + const gchar *appname)
    {
    gchar *path;
    g_return_if_fail(appname != NULL);
    - path = g_build_filename(prefix, "lib", appname, NULL);
    + path = g_build_filename(prefix, LIBDIR, appname, NULL);
    gplugin_manager_prepend_path(path);
    g_free(path);
    --- a/gplugin/gplugin.pc.in Tue May 19 00:22:26 2015 -0500
    +++ b/gplugin/gplugin.pc.in Tue May 19 00:25:51 2015 -0500
    @@ -2,7 +2,7 @@
    libdir=${prefix}/lib
    includedir=${prefix}/include/gplugin-1.0/
    -plugindir=${libdir}
    +plugindir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
    Name: libgplugin
    Description: A fully featured GModule based plugin library