chiark / gitweb /
path: optionally, create watched directories in .path units
[elogind.git] / Makefile.am
index 4e244807c820d2a87eb2b02a8a00f09e2f4e5b39..6a5c491bf1a84de224d5f9fecc0d41659efdaa37 100644 (file)
@@ -232,7 +232,7 @@ dist_systemunit_DATA = \
        units/reboot.target \
        units/rescue.target \
        units/rpcbind.target \
-       units/rtc-set.target \
+       units/time-sync.target \
        units/shutdown.target \
        units/final.target \
        units/umount.target \
@@ -274,7 +274,6 @@ dist_systemunit_DATA += \
        units/var-lock.mount
 endif
 
-
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
@@ -573,7 +572,8 @@ MANPAGES = \
        man/os-release.5 \
        man/modules-load.d.5 \
        man/binfmt.d.5 \
-       man/sysctl.d.5
+       man/sysctl.d.5 \
+        man/systemd-ask-password.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -1320,13 +1320,11 @@ install-data-hook:
                        fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
-                       var-lock.mount \
                        media.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../var-lock.mount var-lock.mount && \
                $(LN_S) ../media.mount media.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
@@ -1474,6 +1472,12 @@ if TARGET_DEBIAN_OR_UBUNTU
                $(LN_S) multi-user.target runlevel5.target )
 endif
 
+if HAVE_SYSV_COMPAT
+       ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+               rm -f var-lock.mount && \
+               $(LN_S) ../var-lock.mount var-lock.mount )
+endif
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \