X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=35ecebaadda9526579451f5e5b995664ace65fb9;hp=0da02af0056edf5812ff6cce2065eb8b4799591e;hb=dfac97b21e00cd3617ba817227db7b621841b5cc;hpb=797e2f0e4df4797f739bfe405c238e847d184ebf

diff --git a/Makefile.am b/Makefile.am
index 0da02af00..35ecebaad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,10 +59,10 @@ noinst_PROGRAMS = \
 	test-loopback
 
 dist_dbuspolicy_DATA = \
-	org.freedesktop.systemd1.conf
+	src/org.freedesktop.systemd1.conf
 
 dist_udevrules_DATA = \
-	99-systemd.rules
+	src/99-systemd.rules
 
 dist_systemunit_DATA = \
 	units/emergency.service \
@@ -70,8 +70,8 @@ dist_systemunit_DATA = \
 	units/systemd-logger.socket
 
 systemunit_DATA = \
-	systemd-initctl.service \
-	systemd-logger.service
+	units/systemd-initctl.service \
+	units/systemd-logger.service
 
 EXTRA_DIST = \
 	units/systemd-initctl.service.in \
@@ -144,12 +144,12 @@ EXTRA_DIST += \
 	src/sd-daemon.h
 
 dist_man_MANS = \
-	systemd.unit.5 \
-	systemd.service.5
+	man/systemd.unit.5 \
+	man/systemd.service.5
 
 HTMLMANS = \
-	systemd.unit.html \
-	systemd.service.html
+	man/systemd.unit.html \
+	man/systemd.service.html
 
 dist_noinst_DATA = \
 	$(HTMLMANS)
@@ -260,12 +260,14 @@ systemadm_SOURCES = \
 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
+units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
+	$(MKDIR_P) units
 	$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
 		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
 		< $< > $@
 
-systemd-logger.service: units/systemd-logger.service.in Makefile
+units/systemd-logger.service: units/systemd-logger.service.in Makefile
+	$(MKDIR_P) units
 	$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
 		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
 		< $< > $@
@@ -274,14 +276,16 @@ CLEANFILES = \
 	src/systemd-interfaces.c \
 	src/systemctl.c \
 	src/systemadm.c \
-	systemd-initctl.service \
-	systemd-logger.service
+	units/systemd-initctl.service \
+	units/systemd-logger.service
 
 if HAVE_XSLTPROC
-%.5: man/%.xml
+man/%.5: man/%.xml
+	$(MKDIR_P) man
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-%.html: man/%.xml
+man/%.html: man/%.xml
+	$(MKDIR_P) man
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 CLEANFILES += \