diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-09 13:38:04 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-23 14:11:48 +0000 |
| commit | 352d2da805561ec0164a6e800cd3c3e3bbc629f3 (patch) | |
| tree | ac54d59da94d4397d9c71d3d585d7ac91eb0cbcd /plugins | |
| parent | f06469da5cfc7c8dc750bce82099dde4b528a20b (diff) | |
Replace plugindir with an AC_ARG_VAR so it can be passed to configure
This lets you configure the plugin directory:
./configure pluginexecdir='${libdir}/my-gabble-plugins'
The directory-name variable has 'exec' in it because Automake installs
unknown directory names with 'exec' in their variable name during
"make install-exec", and other unknown directory names during
"make install-data".
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46417
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
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 e0f974940..a51160472 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,5 +1,3 @@ -plugindir = $(libdir)/telepathy/gabble-0 - installable_plugins = \ libconsole.la \ libgateways.la @@ -25,11 +23,11 @@ noinst_LTLIBRARIES = \ # because libtest.la is not installed, libtool will want to compile it as static # despite -shared (a convenience library), unless we also use -rpath -libtest_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(plugindir) +libtest_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(pluginexecdir) endif if ENABLE_PLUGINS -plugin_LTLIBRARIES = $(installable_plugins) +pluginexec_LTLIBRARIES = $(installable_plugins) dist_bin_SCRIPTS = \ telepathy-gabble-xmpp-console |