X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=91ecbe4a0bc1d39688cecbbf015a21ed4e835a8b;hb=8328d8c63332319965fd288634a9a709e9b96425;hp=15a38bd4ca3877569f01ba1577d5b7d330ef01b0;hpb=e091457e822ff35ff7b1d3b3a1f91c2ee6249e5a;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 15a38bd4c..91ecbe4a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,6 +189,7 @@ AM_CPPFLAGS = \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/shared \
 	-I $(top_srcdir)/src/shared \
@@ -1224,13 +1225,11 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 manual_tests += \
-	test-engine \
 	test-ns \
 	test-loopback \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
-	test-cgroup-mask \
 	test-install \
 	test-watchdog \
 	test-log \
@@ -1242,6 +1241,8 @@ manual_tests += \
 endif
 
 tests += \
+	test-engine \
+	test-cgroup-mask \
 	test-job-type \
 	test-env-replace \
 	test-strbuf \
@@ -4438,9 +4439,6 @@ dist_pkgdata_DATA += \
 dist_noinst_SCRIPT = \
 	src/locale/generate-kbd-model-map
 
-update-kbd-model-map: src/locale/generate-kbd-model-map
-	$PYTHON $< >src/locale/kbd-model-map
-
 localectl_SOURCES = \
 	src/locale/localectl.c
 
@@ -4555,7 +4553,7 @@ nodist_systemunit_DATA += \
 	units/systemd-timesyncd.service
 
 GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-timesyncd.service
+	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
 
 EXTRA_DIST += \
 	units/systemd-timesyncd.service.in