From 48c67a167a3bfe7cdd0c8fd49a226bb31e2d05f9 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 26 Mar 2014 17:32:20 +0000 Subject: [PATCH 1/3] Change plugin directory to avoid collision with MC 5 --- mission-control-plugins-6-uninstalled.pc.in | 2 +- mission-control-plugins-6.pc.in | 4 ++-- src/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mission-control-plugins-6-uninstalled.pc.in b/mission-control-plugins-6-uninstalled.pc.in index c211a21..531710f 100644 --- a/mission-control-plugins-6-uninstalled.pc.in +++ b/mission-control-plugins-6-uninstalled.pc.in @@ -5,7 +5,7 @@ libexecdir=@libexecdir@ includedir=@includedir@ MCP_API_VERSION=@MCP_API_VERSION@ MCP_ABI_VERSION=@MCP_ABI_VERSION@ -plugindir=${libdir}/mission-control-plugins.@MCP_ABI_VERSION@ +plugindir=${libdir}/mission-control-plugins-6-@MCP_ABI_VERSION@ missioncontrolpath=${libexecdir}/mission-control-6 abs_top_srcdir=@abs_top_srcdir@ abs_top_builddir=@abs_top_builddir@ diff --git a/mission-control-plugins-6.pc.in b/mission-control-plugins-6.pc.in index 04ab698..864046f 100644 --- a/mission-control-plugins-6.pc.in +++ b/mission-control-plugins-6.pc.in @@ -5,8 +5,8 @@ libexecdir=@libexecdir@ includedir=@includedir@ MCP_API_VERSION=@MCP_API_VERSION@ MCP_ABI_VERSION=@MCP_ABI_VERSION@ -plugindir=${libdir}/mission-control-plugins.@MCP_ABI_VERSION@ -missioncontrolpath=${libexecdir}/mission-control-5 +plugindir=${libdir}/mission-control-plugins-6-@MCP_ABI_VERSION@ +missioncontrolpath=${libexecdir}/mission-control-6 Name: mission-control-plugins Description: Mission Control plugin API diff --git a/src/Makefile.am b/src/Makefile.am index 2416848..b78b67d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ -DG_LOG_DOMAIN=\"mcd\" \ - -DMCD_PLUGIN_LOADER_DIR=\"@libdir@/mission-control-plugins.@MCP_ABI_VERSION@\" \ + -DMCD_PLUGIN_LOADER_DIR=\"@libdir@/mission-control-plugins-6-@MCP_ABI_VERSION@\" \ -DMC_DISABLE_DEPRECATED -I$(top_srcdir) AM_CFLAGS = $(ERROR_CFLAGS) -- 1.9.1