Make client & service files installable

11 files changed, 50 insertions, 29 deletions

diff --git a/configure.ac b/configure.ac
index 30e805a..1cafe81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,5 +64,4 @@ AC_OUTPUT( Makefile \
           src/Makefile \
           data/Makefile \
           data/phoenix/Makefile \
-          data/phoenix/uninstalled/Makefile \
 )
diff --git a/data/phoenix/Makefile.am b/data/phoenix/Makefile.am
index d6ada7b..6b920fd 100644
--- a/data/phoenix/Makefile.am
+++ b/data/phoenix/Makefile.am
@@ -1 +1,46 @@
-SUBDIRS=uninstalled
+U_DBUS=uninstalled/dbus-1/services
+
+service_files = \
+  org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
+  org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
+  org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
+  org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
+
+uninstalled_service_files = \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
+
+client_files = \
+  telepathy-clients/Phoenix.EchoCall.client \
+  telepathy-clients/Phoenix.EchoText.client \
+  telepathy-clients/Phoenix.Approver.client \
+  telepathy-clients/Phoenix.Authenticator.client
+
+uninstalled_client_files = \
+  uninstalled/telepathy/clients/Phoenix.EchoCall.client \
+  uninstalled/telepathy/clients/Phoenix.EchoText.client \
+  uninstalled/telepathy/clients/Phoenix.Approver.client \
+  uninstalled/telepathy/clients/Phoenix.Authenticator.client
+
+$(U_DBUS)/org.freedesktop.Telepathy.Client.%.service: dbus-services/%.service.in
+	$(MKDIR_P) $(U_DBUS)
+	$(AM_V_GEN)sed -e "s|[@]PATH[@]|@abs_top_builddir@/src|g" $< > $@
+
+uninstalled/telepathy/clients/%.client: telepathy-clients/%.client
+	$(MKDIR_P) uninstalled/telepathy/clients
+	cp $< $@
+
+org.freedesktop.Telepathy.Client.%.service: dbus-services/%.service.in
+	$(AM_V_GEN)sed -e "s|[@]PATH[@]|$(libexecdir)|g" $< > $@
+
+
+xdgdatadir = $(pkgdatadir)/data
+dbusservicesdir = $(xdgdatadir)/dbus-1/services
+dbusservices_DATA = $(service_files)
+tpclientsdir = $(xdgdatadir)/telepathy/clients
+tpclients_DATA = $(client_files)
+
+BUILT_SOURCES=$(uninstalled_service_files) $(uninstalled_client_files)
+CLEANFILES = $(BUILT_SOURCES) $(service_files)
diff --git a/data/phoenix/uninstalled/dbus-1/services/Phoenix.Approver.service.in b/data/phoenix/dbus-services/Phoenix.Approver.service.in
index 15b5c21..a2a7f46 100644
--- a/data/phoenix/uninstalled/dbus-1/services/Phoenix.Approver.service.in
+++ b/data/phoenix/dbus-services/Phoenix.Approver.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.Phoenix.Approver
-Exec=@abs_top_builddir@/src/phoenix-approver
+Exec=@PATH@/phoenix-approver
diff --git a/data/phoenix/uninstalled/dbus-1/services/Phoenix.Authenticator.service.in b/data/phoenix/dbus-services/Phoenix.Authenticator.service.in
index 0e79ac1..8a83fdd 100644
--- a/data/phoenix/uninstalled/dbus-1/services/Phoenix.Authenticator.service.in
+++ b/data/phoenix/dbus-services/Phoenix.Authenticator.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.Phoenix.Authenticator
-Exec=@abs_top_builddir@/src/phoenix-authenticator
+Exec=@PATH@/phoenix-authenticator
diff --git a/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoCall.service.in b/data/phoenix/dbus-services/Phoenix.EchoCall.service.in
index 2a12621..a09ffaf 100644
--- a/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoCall.service.in
+++ b/data/phoenix/dbus-services/Phoenix.EchoCall.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.Phoenix.EchoCall
-Exec=@abs_top_builddir@/src/phoenix-echo-call
+Exec=@PATH@/phoenix-echo-call
diff --git a/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoText.service.in b/data/phoenix/dbus-services/Phoenix.EchoText.service.in
index 66d481c..66af9fc 100644
--- a/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoText.service.in
+++ b/data/phoenix/dbus-services/Phoenix.EchoText.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.Phoenix.EchoText
-Exec=@abs_top_builddir@/src/phoenix-echo-text
+Exec=@PATH@/phoenix-echo-text
diff --git a/data/phoenix/uninstalled/telepathy/clients/Phoenix.Approver.client.in b/data/phoenix/telepathy-clients/Phoenix.Approver.client
index 6248824..6248824 100644
--- a/data/phoenix/uninstalled/telepathy/clients/Phoenix.Approver.client.in
+++ b/data/phoenix/telepathy-clients/Phoenix.Approver.client
diff --git a/data/phoenix/uninstalled/telepathy/clients/Phoenix.Authenticator.client.in b/data/phoenix/telepathy-clients/Phoenix.Authenticator.client
index 68ddbd5..68ddbd5 100644
--- a/data/phoenix/uninstalled/telepathy/clients/Phoenix.Authenticator.client.in
+++ b/data/phoenix/telepathy-clients/Phoenix.Authenticator.client
diff --git a/data/phoenix/uninstalled/telepathy/clients/Phoenix.EchoCall.client.in b/data/phoenix/telepathy-clients/Phoenix.EchoCall.client
index 661b89f..661b89f 100644
--- a/data/phoenix/uninstalled/telepathy/clients/Phoenix.EchoCall.client.in
+++ b/data/phoenix/telepathy-clients/Phoenix.EchoCall.client
diff --git a/data/phoenix/uninstalled/telepathy/clients/Phoenix.EchoText.client.in b/data/phoenix/telepathy-clients/Phoenix.EchoText.client
index 271c51c..271c51c 100644
--- a/data/phoenix/uninstalled/telepathy/clients/Phoenix.EchoText.client.in
+++ b/data/phoenix/telepathy-clients/Phoenix.EchoText.client
diff --git a/data/phoenix/uninstalled/Makefile.am b/data/phoenix/uninstalled/Makefile.am
deleted file mode 100644
index baeb7ef..0000000
--- a/data/phoenix/uninstalled/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-service_files = \
-  dbus-1/services/org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
-  dbus-1/services/org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
-  dbus-1/services/org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
-  dbus-1/services/org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
-
-client_files = \
-  telepathy/clients/Phoenix.EchoCall.client \
-  telepathy/clients/Phoenix.EchoText.client \
-  telepathy/clients/Phoenix.Approver.client \
-  telepathy/clients/Phoenix.Authenticator.client
-
-dbus-1/services/org.freedesktop.Telepathy.Client.%.service: dbus-1/services/%.service.in
-	$(MKDIR_P) dbus-1/services
-	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
-
-telepathy/clients/%.client: telepathy/clients/%.client.in
-	$(MKDIR_P) telepathy/clients
-	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
-
-
-BUILT_SOURCES=$(service_files) $(client_files)
-CLEANFILES = $(BUILT_SOURCES)