diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-23 15:10:18 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-26 12:14:18 +0100 |
| commit | 53d069ae0f6cc3f0457a837d58496c79304190f7 (patch) | |
| tree | 42ee4cacfa50c875d74bd76555ddc854a826f3c6 /plugins | |
| parent | 4b2480d928b3a3083ba21010607239cb8f85a40e (diff) | |
| download | telepathy-salut-53d069ae0f6cc3f0457a837d58496c79304190f7.tar.gz | |
Replace plugindir with an AC_ARG_VAR so it can be passed to configure
Similar to https://bugs.freedesktop.org/show_bug.cgi?id=46417 in Gabble.
This lets you configure the plugin directory:
./configure pluginexecdir='${libdir}/my-salut-plugins'
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47774
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 3bef2ce0..5325b93f 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,5 +1,3 @@ -plugindir = $(libdir)/telepathy/salut-0 - # testing-only plugins noinst_LTLIBRARIES = \ test.la @@ -8,7 +6,7 @@ installable_plugins = $(NULL) if ENABLE_PLUGINS -plugin_LTLIBRARIES = $(installable_plugins) +pluginexec_LTLIBRARIES = $(installable_plugins) else # we still compile the plugin (just to make sure it compiles!) but we don't # install it @@ -23,7 +21,7 @@ test_la_SOURCES = \ # because test.la is not installed, libtool will want to compile it as static # despite -shared (a convenience library), unless we also use -rpath -test_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(plugindir) +test_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(pluginexecdir) AM_CFLAGS = $(ERROR_CFLAGS) \ -I $(top_srcdir) -I $(top_builddir) \ |