X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=370ee2e648b713f4550b7e50eb2d240a7c8b9613;hp=816a8eb4a4bef0f7ba042d15c248a4e336ac4cf9;hb=d1f9edafe7b832c507931640f32069d001916b0e;hpb=75d67e683735035949bfdcf71140747b9909d8a1

diff --git a/Makefile.am b/Makefile.am
index 816a8eb4a..370ee2e64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,6 +96,7 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
 dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dbusinterface_DATA =
 dist_dbussystemservice_DATA =
@@ -132,6 +133,7 @@ AM_CPPFLAGS = \
 	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+	-DSYSTEMD_NTP_UNITS=\"$(pkgdatadir)/ntp-units\" \
 	-DX_SERVER=\"$(bindir)/X\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -309,7 +311,6 @@ dist_systemunit_DATA = \
 	units/syslog.target \
 	units/systemd-udev-control.socket \
 	units/systemd-udev-kernel.socket \
-	units/systemd-timedated-ntp.target  \
 	units/system-update.target
 
 nodist_systemunit_DATA = \
@@ -342,7 +343,7 @@ nodist_systemunit_DATA = \
 	units/systemd-udev.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
-	units/systemd-debug-shell.service
+	units/debug-shell.service
 
 dist_userunit_DATA = \
 	units/user/default.target \
@@ -380,7 +381,7 @@ EXTRA_DIST += \
 	units/systemd-udev.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
-	units/systemd-debug-shell.service.in \
+	units/debug-shell.service.in \
 	units/systemd-hibernate.service.in \
 	units/systemd-suspend.service.in \
 	introspect.awk \
@@ -1491,7 +1492,7 @@ libudev_private_la_LIBADD = \
 MANPAGES += \
 	man/udev.7 \
 	man/udevadm.8 \
-	man/systemd-udevd.service.8
+	man/systemd-udev.service.8
 
 MANPAGES_ALIAS += \
 	man/systemd-udevd.8
@@ -2745,7 +2746,7 @@ man/systemd-localed.8: man/systemd-localed.service.8
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
 	src/locale/kbd-model-map
 
 dist_noinst_SCRIPT = \
@@ -2801,6 +2802,9 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	timedated-install-data-hook
 
+dist_pkgdata_DATA += \
+	src/timedate/ntp-units
+
 MANPAGES += \
 	man/systemd-timedated.service.8
 
@@ -3389,9 +3393,6 @@ if TARGET_FEDORA
 		rm -f display-manager.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) rescue.service single.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_MANDRIVA
@@ -3400,9 +3401,6 @@ if TARGET_MANDRIVA
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) prefdm.service dm.service && \
 		$(LN_S) rescue.service single.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_DEBIAN_OR_UBUNTU
@@ -3422,9 +3420,6 @@ if TARGET_MAGEIA
 		rm -f display-manager.service && \
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) prefdm.service dm.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)