diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-06 15:57:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-06 15:57:37 +0200 |
| commit | f80781eaf9f927d7b4d5e66116e3f3a4242e6fa1 (patch) | |
| tree | 0e8fbc5d09df17bdc43b0b22fd6061850e19e654 /Makefile.am | |
| parent | e252dd8f0ee40ac1c20d524f3622641c7907919f (diff) | |
var-lock: don't try to enable var-lock.mount if we don't install it
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 4e244807c..160acfb9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,6 @@ dist_systemunit_DATA += \ units/var-lock.mount endif - nodist_systemunit_DATA = \ units/getty@.service \ units/serial-getty@.service \ @@ -1320,13 +1319,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 +1471,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) \ |