Fedora: don't ship [Install] sections; these are enabled in the system configuration.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b005f3aa6784117d7a009228495548f65e76b303..3c65febb500c56fcc7d0edc5ac9cd32c0ef0142e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -399,6 +399,7 @@ libsystemd_core_la_SOURCES = \
        src/cgroup.c \
        src/mount-setup.c \
        src/hostname-setup.c \
+       src/selinux-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
@@ -1174,13 +1175,10 @@ if TARGET_FEDORA
                $(DESTDIR)$(systemunitdir)/rescue.target.wants \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f prefdm.service && \
                $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
@@ -1203,10 +1201,8 @@ if TARGET_FEDORA
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f local.service && \
-               $(LN_S) rc-local.service local.service )
-       ( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
-               $(LN_S) halt reboot > /dev/null 2>&1 || true )
+               rm -f display-manager.service && \
+               $(LN_S) prefdm.service display-manager.service )
 endif
 if TARGET_GENTOO
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
@@ -1248,5 +1244,7 @@ git-tag:
 
 # Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
 fedora: install
-       rm /lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
+       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
+       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
+       sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \
+               -e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf