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 \