chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
util: modernize get_parent_of_pid() a bit
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8df636f39c840258d9b9a84f01f560beb2b3fbd7..6a5c491bf1a84de224d5f9fecc0d41659efdaa37 100644 (file)
--- 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 \
@@ -58,8 +57,8 @@ AM_CPPFLAGS = \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-       -DRUNTIME_DIR=\"$(localstatedir)/run\" \
+       -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+       -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -112,7 +111,10 @@ rootbin_PROGRAMS = \
 bin_PROGRAMS = \
        systemd-cgls \
        systemd-stdio-bridge \
-        systemd-nspawn
+       systemd-nspawn
+
+dist_bin_SCRIPTS = \
+       src/systemd-analyze
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -141,10 +143,11 @@ rootlibexec_PROGRAMS = \
        systemd-timestamp \
        systemd-ac-power \
        systemd-detect-virt \
-       systemd-sysctl
+       systemd-sysctl \
+       systemd-binfmt
 
 systemgenerator_PROGRAMS = \
-        systemd-getty-generator
+       systemd-getty-generator
 
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -198,12 +201,17 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Path.xml
 
 dist_bashcompletion_DATA = \
-        src/systemctl-bash-completion.sh
+       src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/x11.conf
 
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+       tmpfiles.d/legacy.conf
+endif
+
 dist_systemunit_DATA = \
        units/graphical.target \
        units/multi-user.target \
@@ -224,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 \
@@ -245,7 +253,6 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
-       units/var-lock.mount \
        units/var-run.mount \
        units/media.mount \
        units/hwclock-load.service \
@@ -262,10 +269,15 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-console.path \
        units/syslog.target
 
+if HAVE_SYSV_COMPAT
+dist_systemunit_DATA += \
+       units/var-lock.mount
+endif
+
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
-        units/console-shell.service \
+       units/console-shell.service \
        units/remote-fs.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
@@ -287,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 \
@@ -307,7 +320,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-        units/console-shell.service.m4 \
+       units/console-shell.service.m4 \
        units/remote-fs.target.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
@@ -330,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 \
@@ -497,7 +511,7 @@ EXTRA_DIST += \
        ${libsystemd_core_la_SOURCES:.c=.h} \
        ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
-        src/def.h \
+       src/def.h \
        src/ioprio.h \
        src/missing.h \
        src/list.h \
@@ -556,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 \
@@ -786,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
@@ -1097,13 +1123,15 @@ pam_systemd_la_LIBADD = \
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-                -e 's,@rootbindir\@,$(rootbindir),g' \
-                -e 's,@bindir\@,$(bindir),g' \
+               -e 's,@rootbindir\@,$(rootbindir),g' \
+               -e 's,@bindir\@,$(bindir),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -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' \
@@ -1226,6 +1254,14 @@ CLEANFILES += \
        $(dbusinterface_DATA)
 
 install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(tmpfilesdir) \
+               $(DESTDIR)$(sysconfdir)/modules-load.d \
+               $(DESTDIR)$(sysconfdir)/sysctl.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d \
+               $(DESTDIR)$(systemshutdowndir) \
+               $(DESTDIR)$(systemgeneratordir) \
+               $(DESTDIR)$(usergeneratordir)
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(userunitdir) \
@@ -1284,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 && \
@@ -1344,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 && \
@@ -1357,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 )
@@ -1406,7 +1442,7 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
-                $(LN_S) rescue.service single.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 )
@@ -1421,9 +1457,10 @@ if TARGET_MANDRIVA
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service single.service && \
+               rm -f display-manager.service dm.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
-                $(LN_S) rescue.service single.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 )
@@ -1435,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) \
Unnamed repository; edit this file 'description' to name the repository.