execute: socket isn't abstract anymore

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a94d2a7f7d31dc1567f38966655ee1bb01f307c3..130e76c452f485bf681e68518d73891d293e66ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,6 +205,8 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/x11.conf
 
 dist_systemunit_DATA = \
+       units/graphical.target \
+       units/multi-user.target \
        units/emergency.service \
        units/emergency.target \
        units/sysinit.target \
@@ -257,15 +259,14 @@ 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
 
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
         units/console-shell.service \
-       units/graphical.target \
        units/remote-fs.target \
-       units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
@@ -286,7 +287,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 \
@@ -308,8 +308,6 @@ EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
         units/console-shell.service.m4 \
-       units/graphical.target.m4 \
-       units/multi-user.target.m4 \
        units/remote-fs.target.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
@@ -332,7 +330,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 \
@@ -1102,7 +1099,6 @@ SED_PROCESS = \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                 -e 's,@rootbindir\@,$(rootbindir),g' \
                 -e 's,@bindir\@,$(bindir),g' \
-               -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
@@ -1331,10 +1327,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 )
@@ -1412,8 +1404,9 @@ if TARGET_FEDORA
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) prefdm.service display-manager.service )
+               rm -f display-manager.service single.service && \
+               $(LN_S) prefdm.service display-manager.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 )
@@ -1428,8 +1421,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 && \
-               $(LN_S) prefdm.service display-manager.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 && \
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )