X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=cf563867f3f64da431d1265b321e213ab6e4680c;hb=4f4a1dbf2171aa62da04d2e3b6945e8992139d14;hp=8ad1969bdcd8641718b1c1de0dd075cdb0caeae8;hpb=64c1b5bf9c5777261bdf4058b6cd1cb5de193d5b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8ad1969bd..cf563867f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,12 +17,12 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-pkgsysconfdir=$(sysconfdir)/systemd
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
-udevrulesdir=/lib/udev/rules.d
+udevrulesdir=@udevrulesdir@
 
+pkgsysconfdir=$(sysconfdir)/systemd
 systemunitdir=$(pkgdatadir)/system
-sessionunitdir=$(pkgdatadir)/system
+sessionunitdir=$(pkgdatadir)/session
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
@@ -35,8 +35,9 @@ AM_CPPFLAGS = \
 	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
 
-#	-DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
-VALA_CFLAGS=-Wno-unused-variable -Wno-unused-function
+VALA_CFLAGS = \
+	-Wno-unused-variable \
+	-Wno-unused-function
 
 sbin_PROGRAMS = \
 	systemd
@@ -60,27 +61,24 @@ noinst_PROGRAMS = \
 	test-ns \
 	test-loopback
 
-dbuspolicy_DATA = \
+dist_dbuspolicy_DATA = \
 	org.freedesktop.systemd1.conf
 
-udevrules_DATA = \
+dist_udevrules_DATA = \
 	99-systemd.rules
 
-systemunit_DATA = \
+dist_systemunit_DATA = \
 	units/emergency.service \
-	systemd-initctl.service \
 	units/systemd-initctl.socket \
-	systemd-logger.service \
 	units/systemd-logger.socket
 
+systemunit_DATA = \
+	systemd-initctl.service \
+	systemd-logger.service
+
 EXTRA_DIST = \
-	org.freedesktop.systemd1.conf \
-	99-systemd.rules \
-	units/emergency.service \
 	units/systemd-initctl.service.in \
-	units/systemd-initctl.socket \
 	units/systemd-logger.service.in \
-	units/systemd-logger.socket \
 	LICENSE \
 	README
 
@@ -147,6 +145,21 @@ EXTRA_DIST += \
 	linux/auto_dev-ioctl.h \
 	initreq.h
 
+dist_man_MANS = \
+	systemd.unit.5 \
+	systemd.service.5
+
+HTMLMANS = \
+	systemd.unit.html \
+	systemd.service.html
+
+dist_noinst_DATA = \
+	$(HTMLMANS)
+
+EXTRA_DIST += \
+	man/systemd.unit.xml \
+	man/systemd.service.xml
+
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
 	main.c
@@ -194,11 +207,15 @@ test_loopback_LDADD = $(systemd_LDADD)
 
 systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
-	logger.c
+	logger.c \
+	sd-daemon.c \
+	sd-daemon.h
 
 systemd_initctl_SOURCES = \
 	$(BASIC_SOURCES) \
-	initctl.c
+	initctl.c \
+	sd-daemon.c \
+	sd-daemon.h
 
 systemd_initctl_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
@@ -251,11 +268,28 @@ CLEANFILES = \
 	systemd-initctl.service \
 	systemd-logger.service
 
+if HAVE_XSLTPROC
+%.5: man/%.xml
+	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.html: man/%.xml
+	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+
+CLEANFILES += \
+	$(dist_man_MANS) \
+	$(HTMLMANS)
+endif
+
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir) \
+		$(DESTDIR)$(sessionunitdir) \
 		$(DESTDIR)$(pkgsysconfdir)/system \
 		$(DESTDIR)$(pkgsysconfdir)/session \
 		$(DESTDIR)$(sysconfdir)/xdg/systemd \
 		$(DESTDIR)/cgroup/debug
 	rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
 	ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)