[Telepathy-commits] [telepathy-glib/master] client example programs: optionally install to libexecdir

[Simon McVittie]

---
 examples/client/Makefile.am |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am
index 288cd3d..78e5ea0 100644
--- a/examples/client/Makefile.am
+++ b/examples/client/Makefile.am
@@ -1,29 +1,35 @@
-noinst_PROGRAMS =
+EXAMPLES =
 
-noinst_PROGRAMS += telepathy-example-inspect-channel
+EXAMPLES += telepathy-example-inspect-channel
 telepathy_example_inspect_channel_SOURCES = inspect-channel.c
 
-noinst_PROGRAMS += telepathy-example-inspect-connection
+EXAMPLES += telepathy-example-inspect-connection
 telepathy_example_inspect_connection_SOURCES = inspect-connection.c
 
-noinst_PROGRAMS += telepathy-example-inspect-contact
+EXAMPLES += telepathy-example-inspect-contact
 telepathy_example_inspect_contact_SOURCES = inspect-contact.c
 
-noinst_PROGRAMS += telepathy-example-inspect-cm
+EXAMPLES += telepathy-example-inspect-cm
 telepathy_example_inspect_cm_SOURCES = inspect-cm.c
 
-noinst_PROGRAMS += telepathy-example-list-connections
+EXAMPLES += telepathy-example-list-connections
 telepathy_example_list_connections_SOURCES = list-connections.c
 
-noinst_PROGRAMS += telepathy-example-list-managers
+EXAMPLES += telepathy-example-list-managers
 telepathy_example_list_managers_SOURCES = list-managers.c
 
-noinst_PROGRAMS += telepathy-example-extended-client
+EXAMPLES += telepathy-example-extended-client
 telepathy_example_extended_client_SOURCES = extended-client.c
 telepathy_example_extended_client_LDADD = \
     $(top_builddir)/examples/extensions/libexample-extensions.la \
     $(LDADD)
 
+if INSTALL_EXAMPLES
+bin_PROGRAMS = $(EXAMPLES)
+else
+noinst_PROGRAMS = $(EXAMPLES)
+endif
+
 # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
 # pkg-config via autoconf) instead of the .la path
 LDADD = \
-- 
1.5.6.5