diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-08-19 19:10:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 19:10:30 +0200 |
| commit | a457bd26cc8b1a20fdfca39e3f57a079aaf97940 (patch) | |
| tree | 1cf396516f0217dff1583657180fb13572e8d995 /Makefile.am | |
| parent | dc9710ae23a82c8353d016d410a4cca02f14f6b5 (diff) | |
| parent | f16517151310b88591f3501a59e23ae2a79e7f02 (diff) | |
Merge pull request #3955 from keszybz/fix-preset-all
Fix preset-all
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index d4e3e9a013..a1bb21e4fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -575,7 +575,16 @@ dist_userunit_DATA = \ units/user/default.target \ units/user/exit.target \ units/user/graphical-session.target \ - units/user/graphical-session-pre.target + units/user/graphical-session-pre.target \ + units/user/bluetooth.target \ + units/user/busnames.target \ + units/user/paths.target \ + units/user/printer.target \ + units/user/shutdown.target \ + units/user/smartcard.target \ + units/user/sockets.target \ + units/user/sound.target \ + units/user/timers.target nodist_userunit_DATA = \ units/user/systemd-exit.service @@ -634,6 +643,10 @@ EXTRA_DIST += \ units/rc-local.service.in \ units/halt-local.service.in +GENERAL_ALIASES += \ + $(systemunitdir)/reboot.target $(pkgsysconfdir)/system/ctrl-alt-del.target \ + $(systemunitdir)/machines.target $(pkgsysconfdir)/system/multi-user.target.wants/machines.target + # automake is broken and can't handle files with a dash in front # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8 units-install-hook: @@ -6292,19 +6305,6 @@ SYSTEM_UNIT_ALIASES += \ reboot.target ctrl-alt-del.target \ getty@.service autovt@.service -USER_UNIT_ALIASES += \ - $(systemunitdir)/shutdown.target shutdown.target \ - $(systemunitdir)/sockets.target sockets.target \ - $(systemunitdir)/timers.target timers.target \ - $(systemunitdir)/paths.target paths.target \ - $(systemunitdir)/bluetooth.target bluetooth.target \ - $(systemunitdir)/printer.target printer.target \ - $(systemunitdir)/sound.target sound.target \ - $(systemunitdir)/smartcard.target smartcard.target - -USER_UNIT_ALIASES += \ - $(systemunitdir)/busnames.target busnames.target - GENERAL_ALIASES += \ $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \ $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \ |