tmpfiles: split off rules for legacy systems into legacy.conf

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 371cc562e92bcb60776166f3bff0af6e85d8205c..12118b1cc08e44e577c0ac8f81ccb6efdea44046 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ AM_CPPFLAGS = \
        -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\" \
+       -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -114,6 +114,9 @@ bin_PROGRAMS = \
        systemd-stdio-bridge \
         systemd-nspawn
 
+dist_bin_SCRIPTS = \
+        src/systemd-analyze
+
 if HAVE_GTK
 bin_PROGRAMS += \
        systemadm \
@@ -204,6 +207,11 @@ 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 \
@@ -1226,6 +1234,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) \
@@ -1327,10 +1342,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 )
@@ -1425,8 +1436,9 @@ 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) prefdm.service dm.service && \
                 $(LN_S) rescue.service single.service )
        ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f display-manager.service && \