[systemd-devel] [PATCH] fix tmpwatch service and timer installation.

[Gustavo Sverzut Barbieri]

---
 Makefile.am |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b5b2a9d..3c3fa3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,7 +183,9 @@ dist_systemunit_DATA = \
 	units/remount-rootfs.service \
 	units/printer.target \
 	units/bluetooth.target \
-	units/smartcard.target
+	units/smartcard.target \
+	units/tmpwatch.service \
+	units/tmpwatch.timer
 
 nodist_systemunit_DATA = \
 	units/sysinit.target \
@@ -938,8 +940,10 @@ install-data-hook:
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service )
 	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-		rm -f systemd-update-utmp-shutdown.service && \
-		$(LN_S) ../systemd-update-utmp-shutdown.service )
+		rm -f systemd-update-utmp-shutdown.service \
+			tmpwatch.service && \
+		$(LN_S) ../systemd-update-utmp-shutdown.service && \
+		$(LN_S) ../tmpwatch.service )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -980,15 +984,13 @@ install-data-hook:
 			proc-sys-fs-binfmt_misc.automount \
 			sys-kernel-debug.automount \
 			sys-kernel-security.automount \
-			tmpwatch.timer \
-			tmpwatch.service && \
+			tmpwatch.timer && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 		$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
 		$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
 		$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
 		$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
-		$(LN_S) ../tmpwatch.timer && \
-		$(LN_S) ../tmpwatch.service )
+		$(LN_S) ../tmpwatch.timer )
 	( cd $(DESTDIR)$(dbussessionservicedir) && \
 		rm -f org.freedesktop.systemd1.service && \
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-- 
1.7.2.2