X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7bf32aa83225728d42af2f396a33f0b5be914f12;hp=5769dcb62ce54cb7b1e5941f6547816138125b7c;hb=07e833bc1d60e282b062eb205bb13215dc0e8cdf;hpb=db25d1d7655b1de4554942e49bc80a9b176ef8df

diff --git a/Makefile.am b/Makefile.am
index 5769dcb62..7bf32aa83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,8 +58,8 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
+	-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+	-DRUNTIME_DIR=\"/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
 	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -112,7 +112,10 @@ rootbin_PROGRAMS = \
 bin_PROGRAMS = \
 	systemd-cgls \
 	systemd-stdio-bridge \
-        systemd-nspawn
+	systemd-nspawn
+
+dist_bin_SCRIPTS = \
+	src/systemd-analyze
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -144,7 +147,7 @@ rootlibexec_PROGRAMS = \
 	systemd-sysctl
 
 systemgenerator_PROGRAMS = \
-        systemd-getty-generator
+	systemd-getty-generator
 
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -198,12 +201,17 @@ dbusinterface_DATA = \
 	org.freedesktop.systemd1.Path.xml
 
 dist_bashcompletion_DATA = \
-        src/systemctl-bash-completion.sh
+	src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
 	tmpfiles.d/x11.conf
 
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+	tmpfiles.d/legacy.conf
+endif
+
 dist_systemunit_DATA = \
 	units/graphical.target \
 	units/multi-user.target \
@@ -245,7 +253,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-debug.mount \
 	units/sys-kernel-security.automount \
 	units/sys-kernel-security.mount \
-	units/var-lock.mount \
 	units/var-run.mount \
 	units/media.mount \
 	units/hwclock-load.service \
@@ -259,12 +266,19 @@ dist_systemunit_DATA = \
 	units/systemd-tmpfiles-clean.timer \
 	units/quotaon.service \
 	units/systemd-ask-password-wall.path \
-	units/systemd-ask-password-console.path
+	units/systemd-ask-password-console.path \
+	units/syslog.target
+
+if HAVE_SYSV_COMPAT
+dist_systemunit_DATA += \
+	units/var-lock.mount
+endif
+
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
-        units/console-shell.service \
+	units/console-shell.service \
 	units/remote-fs.target \
 	units/systemd-initctl.service \
 	units/systemd-logger.service \
@@ -286,7 +300,6 @@ nodist_systemunit_DATA = \
 	units/systemd-ask-password-wall.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
-	units/syslog.target \
 	units/halt.service \
 	units/poweroff.service \
 	units/reboot.service \
@@ -307,7 +320,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
 	units/getty@.service.m4 \
 	units/serial-getty@.service.m4 \
-        units/console-shell.service.m4 \
+	units/console-shell.service.m4 \
 	units/remote-fs.target.m4 \
 	units/rescue.service.m4 \
 	units/systemd-initctl.service.in \
@@ -330,7 +343,6 @@ EXTRA_DIST = \
 	units/systemd-ask-password-wall.service.in \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
-	units/syslog.target.in \
 	units/halt.service.in \
 	units/poweroff.service.in \
 	units/reboot.service.in \
@@ -498,7 +510,7 @@ EXTRA_DIST += \
 	${libsystemd_core_la_SOURCES:.c=.h} \
 	${libsystemd_daemon_la_SOURCES:.c=.h} \
 	src/macro.h \
-        src/def.h \
+	src/def.h \
 	src/ioprio.h \
 	src/missing.h \
 	src/list.h \
@@ -1098,8 +1110,8 @@ pam_systemd_la_LIBADD = \
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-                -e 's,@rootbindir\@,$(rootbindir),g' \
-                -e 's,@bindir\@,$(bindir),g' \
+		-e 's,@rootbindir\@,$(rootbindir),g' \
+		-e 's,@bindir\@,$(bindir),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
@@ -1227,6 +1239,13 @@ CLEANFILES += \
 	$(dbusinterface_DATA)
 
 install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(sysconfdir)/modules-load.d \
+		$(DESTDIR)$(tmpfilesdir) \
+		$(DESTDIR)$(sysconfdir)/sysctl.d \
+		$(DESTDIR)$(systemshutdowndir) \
+		$(DESTDIR)$(systemgeneratordir) \
+		$(DESTDIR)$(usergeneratordir)
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(userunitdir) \
@@ -1328,10 +1347,6 @@ install-data-hook:
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-		rm -f quotaon.service quotacheck.service && \
-		$(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
-		$(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f remote-fs.target && \
 		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
@@ -1411,7 +1426,7 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
-                $(LN_S) rescue.service single.service )
+		$(LN_S) rescue.service single.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
@@ -1426,9 +1441,10 @@ if TARGET_MANDRIVA
 		rm -f halt-local.service && \
 		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service single.service && \
+		rm -f display-manager.service dm.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
-                $(LN_S) rescue.service single.service )
+		$(LN_S) prefdm.service dm.service && \
+		$(LN_S) rescue.service single.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )