X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e562b18a2d178e519b6b3ef771624d15cfdefa12;hp=ebcdedd4fc5f061f5c28525b7e234fb38c057248;hb=d1ab0ca07372649dad70a0348d75e394f254e1b6;hpb=a9b5b03212f9c854938483b8901e433c2ba6619b

diff --git a/Makefile.am b/Makefile.am
index ebcdedd4f..e562b18a2 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
 
 sbin_PROGRAMS = \
 	systemd
@@ -60,27 +61,26 @@ 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
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
@@ -145,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
@@ -222,14 +237,14 @@ systemctl_SOURCES = \
 	systemctl.vala \
 	systemd-interfaces.vala
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS)
+systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
 systemctl_LDADD = $(DBUSGLIB_LIBS)
 
 systemadm_SOURCES = \
 	systemadm.vala \
 	systemd-interfaces.vala
 
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
+systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile
@@ -248,3 +263,27 @@ CLEANFILES = \
 	systemadm.c \
 	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)$(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)