diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 17:32:20 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 09:06:56 +0000 |
| commit | 48c67a167a3bfe7cdd0c8fd49a226bb31e2d05f9 (patch) | |
| tree | 84bb8053f84c15211a586ca5865eebe441862b77 | |
| parent | 2c596f33d0fec042510993aecc95802550588a49 (diff) | |
Change plugin directory to avoid collision with MC 5
| -rw-r--r-- | mission-control-plugins-6-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | mission-control-plugins-6.pc.in | 4 | ||||
| -rw-r--r-- | 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 c211a211..531710f1 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 04ab6987..864046fb 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 2416848c..b78b67d5 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) |