X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=6a5c491bf1a84de224d5f9fecc0d41659efdaa37;hb=f3bc7fdc7bf47193a9f8618a7d22a6ceec2df6f7;hp=7bf32aa83225728d42af2f396a33f0b5be914f12;hpb=5b754353282e3ba3cf9c4ffc50579aff4b7d72db;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 7bf32aa83..6a5c491bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,18 +30,17 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkgdatadir)/user
+userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
-rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
+systemgeneratordir=$(rootlibexecdir)/system-generators
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemunitdir=$(rootdir)/lib/systemd/system
-systemgeneratordir=$(rootdir)/lib/systemd/system-generators
-systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -144,7 +143,8 @@ rootlibexec_PROGRAMS = \
 	systemd-timestamp \
 	systemd-ac-power \
 	systemd-detect-virt \
-	systemd-sysctl
+	systemd-sysctl \
+	systemd-binfmt
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator
@@ -232,7 +232,7 @@ dist_systemunit_DATA = \
 	units/reboot.target \
 	units/rescue.target \
 	units/rpcbind.target \
-	units/rtc-set.target \
+	units/time-sync.target \
 	units/shutdown.target \
 	units/final.target \
 	units/umount.target \
@@ -274,7 +274,6 @@ dist_systemunit_DATA += \
 	units/var-lock.mount
 endif
 
-
 nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
@@ -300,6 +299,7 @@ nodist_systemunit_DATA = \
 	units/systemd-ask-password-wall.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
+	units/systemd-binfmt.service \
 	units/halt.service \
 	units/poweroff.service \
 	units/reboot.service \
@@ -343,6 +343,7 @@ EXTRA_DIST = \
 	units/systemd-ask-password-wall.service.in \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
+	units/systemd-binfmt.service.in \
 	units/halt.service.in \
 	units/poweroff.service.in \
 	units/reboot.service.in \
@@ -569,7 +570,10 @@ MANPAGES = \
 	man/vconsole.conf.5 \
 	man/locale.conf.5 \
 	man/os-release.5 \
-	man/modules-load.d.5
+	man/modules-load.d.5 \
+	man/binfmt.d.5 \
+	man/sysctl.d.5 \
+        man/systemd-ask-password.1
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -799,6 +803,15 @@ systemd_sysctl_CFLAGS = \
 systemd_sysctl_LDADD = \
 	libsystemd-basic.la
 
+systemd_binfmt_SOURCES = \
+	src/binfmt.c
+
+systemd_binfmt_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_binfmt_LDADD = \
+	libsystemd-basic.la
+
 systemd_fsck_SOURCES = \
 	src/fsck.c \
 	src/dbus-common.c
@@ -1116,7 +1129,9 @@ SED_PROCESS = \
 		-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
+		-e 's,@userunitdir\@,$(userunitdir),g' \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
@@ -1240,9 +1255,10 @@ CLEANFILES += \
 
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
-		$(DESTDIR)$(sysconfdir)/modules-load.d \
 		$(DESTDIR)$(tmpfilesdir) \
+		$(DESTDIR)$(sysconfdir)/modules-load.d \
 		$(DESTDIR)$(sysconfdir)/sysctl.d \
+		$(DESTDIR)$(sysconfdir)/binfmt.d \
 		$(DESTDIR)$(systemshutdowndir) \
 		$(DESTDIR)$(systemgeneratordir) \
 		$(DESTDIR)$(usergeneratordir)
@@ -1304,13 +1320,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 && \
@@ -1364,6 +1378,7 @@ install-data-hook:
 			systemd-random-seed-load.service \
 			systemd-tmpfiles-setup.service \
 			systemd-sysctl.service \
+			systemd-binfmt.service \
 			systemd-ask-password-console.path \
 			systemd-kmsg-syslogd.service \
 			cryptsetup.target && \
@@ -1377,6 +1392,7 @@ install-data-hook:
 		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
 		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
+		$(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
 		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
 		$(LN_S) ../systemd-kmsg-syslogd.service && \
 		$(LN_S) ../cryptsetup.target cryptsetup.target )
@@ -1456,6 +1472,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) \