From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 26 Oct 2010 21:15:07 +0000 (+0200)
Subject: build-sys: fix 'make fedora'
X-Git-Tag: v12~139
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=472ff3d64a870dcd767ecf61e07d89d8fb2f272d

build-sys: fix 'make fedora'
---

diff --git a/Makefile.am b/Makefile.am
index b005f3aa6..5c4a2e76d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1248,5 +1248,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