X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=b5d2bf475baa08ca6f18d95f570e614aac96cb87;hb=78acfbb04780f5f992a8fd2d24bf3d1011503ca9;hp=c21e30f35c859b72b09f61a256211521d24224c5;hpb=908e491f7d55209acfbb2595ab1ef5b24502d641;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index c21e30f..b5d2bf4 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -25,7 +25,8 @@ if HAVE_XML
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
-introspectiondir=$(pkgdatadir)/introspection
+introspectiondir=$(datadir)/dbus-1/interfaces
+dbussystemservicesdir=$(datadir)/dbus-1/system-services
 
 AM_CFLAGS+= \
 	-DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
@@ -68,13 +69,31 @@ pkgsysconf_DATA = \
 	avahi-daemon.conf \
 	hosts
 
-service_DATA = \
+dist_service_DATA = \
 	ssh.service \
 	sftp-ssh.service
 
-pkgdata_DATA = \
+dist_pkgdata_DATA = \
 	avahi-service.dtd
 
+%.service: %.service.in
+	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+
+%.socket: %.socket.in
+	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' \
+		-e 's,@avahi_runtime_dir\@,$(avahi_runtime_dir),g' $< > $@
+
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = \
+	avahi-daemon.service \
+	avahi-daemon.socket
+
+dist_dbussystemservices_DATA = \
+	org.freedesktop.Avahi.service
+endif
+
+CLEANFILES = $(systemdsystemunit_DATA)
+
 if ENABLE_CHROOT
 
 avahi_daemon_SOURCES += \
@@ -116,43 +135,32 @@ avahi_daemon_LDADD += \
 
 avahi_daemon_CFLAGS += $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
 
-dbusservice_DATA = avahi-dbus.conf
+dist_dbusservice_DATA = avahi-dbus.conf
 
-introspection_DATA = \
-	Server.introspect \
-	EntryGroup.introspect \
-	DomainBrowser.introspect \
-	ServiceTypeBrowser.introspect \
-	ServiceBrowser.introspect \
-	ServiceResolver.introspect \
-	AddressResolver.introspect \
-	HostNameResolver.introspect \
-	RecordBrowser.introspect
+dist_introspection_DATA = \
+	org.freedesktop.Avahi.Server.xml \
+	org.freedesktop.Avahi.EntryGroup.xml \
+	org.freedesktop.Avahi.DomainBrowser.xml \
+	org.freedesktop.Avahi.ServiceTypeBrowser.xml \
+	org.freedesktop.Avahi.ServiceBrowser.xml \
+	org.freedesktop.Avahi.ServiceResolver.xml \
+	org.freedesktop.Avahi.AddressResolver.xml \
+	org.freedesktop.Avahi.HostNameResolver.xml \
+	org.freedesktop.Avahi.RecordBrowser.xml
 
 endif
 endif
 endif
 
 EXTRA_DIST = \
-	avahi-service.dtd \
 	avahi-daemon.conf \
 	example.service \
-	avahi-dbus.conf \
-	Server.introspect \
-	EntryGroup.introspect \
-	DomainBrowser.introspect \
-	ServiceTypeBrowser.introspect \
-	ServiceBrowser.introspect \
-	ServiceResolver.introspect \
-	AddressResolver.introspect \
-	HostNameResolver.introspect \
-	RecordBrowser.introspect \
-	ssh.service \
-	sftp-ssh.service \
 	hosts \
 	example.service \
 	introspect.dtd \
-	introspect.xsl
+	introspect.xsl \
+	avahi-daemon.service.in \
+	avahi-daemon.socket.in
 
 xmllint:
 	xmllint --noout --valid example.service